378 files changed, 86546 insertions, 81636 deletions

diff --git a/.gitignore b/.gitignore
index 69a229c3e..a00c84a02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,9 +35,16 @@
 /cmdline/apt-key
 /doc/apt-vendor.ent
 /doc/examples/sources.list
+/debian/apt.install
 /debian/libapt-pkg*.install
 /debian/libapt-inst*.install
 /debian/libapt-pkg-dev.install
 /vendor/current
-/vendor/debian/sources.list
-/vendor/ubuntu/sources.list
+/vendor/*/sources.list
+/vendor/*/makefile.auto
+
+# generated for and by abicheck
+/abicheck/apt_build.xml
+/abicheck/apt_installed.xml
+/abicheck/compat_reports/
+/abicheck/logs/
diff --git a/.travis.yml b/.travis.yml
index 2d9194c28..b413134c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: cpp
 before_install:
  - sudo apt-get update -q
- - sudo apt-get install -q --no-install-recommends dpkg-dev debhelper libdb-dev gettext libcurl4-gnutls-dev zlib1g-dev libbz2-dev xsltproc docbook-xsl docbook-xml po4a autotools-dev autoconf automake doxygen debiandoc-sgml stunnel4
+ - sudo ./prepare-release travis-ci
+ - sudo apt-get install -q --no-install-recommends stunnel4
 script: make && make test && test/integration/run-tests
diff --git a/README.MultiArch b/README.MultiArch
deleted file mode 100644
index 588419b8d..000000000
--- a/README.MultiArch
+++ /dev/null
@@ -1,63 +0,0 @@
-Before we start with this topic: Note that MultiArch is not yet ready for
-prime time and/or for the casual user. The implementation is so far widely
-untested and only useful for developers of packagemanagment tools which
-use APT and his friends and maintainers of (upcoming) MultiArch packages.
-This README is especially NOT written for the casual user and is NOT a
-usage guide - you have been warned. It is assumed that the reader has
-at least a bit of knowledge about APT internals, dependency relations
-and the MultiArch spec [0].
-
-Note also that the toolchain isn't ready yet, e.g. while you can simulate
-the installation of MultiArch packages they will more sooner than later
-cause enormous problems if really installed as dpkg can't handle MultiArch
-yet (no, --force-{overwrite,architecture} aren't good options here).
-Other parts of the big picture are missing and/or untested too.
-You have been warned!
-
-
-The implementation is focused on NOT breaking existing singleArch-only
-applications and/or systems as this is the current status-quo for all
-systems. Also, many systems don't need (or can't make use of) MultiArch,
-so APT will proceed in thinking SingleArch as long as it is not explicitly
-told to handle MultiArch:
-To activate MultiArch handling you need to specify architectures you
-want to be considered by APT with the config list APT::Architectures
-(Insert architectures in order of preference).
-APT will download Packages files for all these architectures in the
-update step. Exception: In the sourcelist is the optionfield used:
-deb [ arch=amd64,i386 ] http://example.org/ experimental main
-(This optionfield is a NOP in previous apt versions)
-
-Internally in APT a package is represented as a PkgIterator -
-before MultiArch this PkgIterator was architecture unaware,
-only VerIterators include the architecture they came from.
-This is/was a big problem as all versions in a package are
-considered for dependency resolution, so pinning will not work in all cases.
-
-The problem is solved by a conceptional change:
-A PkgIterator is now architecture aware, so the packages
-of foobar for amd64 and for i386 are now for apt internal totally
-different packages. That is a good thing for e.g. pinning, but
-sometimes you need the information that such packages are belonging together:
-All these foobar packages therefore form a Group accessible with GrpIterators.
-Note that the GrpIterator has the same name as all the packages in this group,
-so e.g. apt-cache pkgnames iterates over GrpIterator to get the package names:
-This is compatible to SingleArch as a Group consists only of a single package
-and also to MultiArch as a Group consists of possible many packages which
-all have the same name and are therefore out of interest for pkgnames.
-
-
-Given all these internal changes it is quite interesting that the actual
-implementation of MultiArch is trivial: Some implicit dependencies and a few
-more provides are all changes needed to get it working. Especially noteworthy
-is that it wasn't needed to change the resolver in any way and other parts only
-need to be told about using GrpIterator instead of PkgIterator, so chances are
-good that libapt-applications will proceed to work without or at least only
-require minor changes, but your mileage may vary…
-
-
-Known Issues and/or noteworthy stuff:
-* The implementation is mostly untested, so it is very likely that APT will
-  eat your kids if you aren't as lucky as the author of these patches.
-
-[0] https://wiki.ubuntu.com/MultiarchSpec
diff --git a/abicheck/run_abi_test b/abicheck/run_abi_test
index 8f2d7d203..18c13dfcb 100755
--- a/abicheck/run_abi_test
+++ b/abicheck/run_abi_test
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# ensure we are in the abibreak subdirectory
+cd "$(readlink -f $(dirname $0))"
+
 if [ ! -d ../build ]; then
 	echo "../build missing, did you run make?"
 	exit 1
@@ -10,7 +13,7 @@ if [ ! -x "$(which abi-compliance-checker 2>/dev/null )" ]; then
 	exit 1
 fi
 
-LIBPATH=$(find /usr/lib/ -type f  -name "libapt-*.so.*" -printf %p\\\\n)
+LIBPATH=$(find /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) -type f -regex '.*/libapt-\(pkg\|inst\)\.so\..*' -printf %p\\\\n)
 sed s#@installed_libapt@#$LIBPATH# apt_installed.xml.in > apt_installed.xml
 
 BUILDPATH=$(readlink -f ../build)
diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index 77dbc55d6..905110781 100644
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -21,7 +21,9 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 
-#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <string>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 41301d1a6..0ba3f0521 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -23,9 +23,11 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/macros.h>
+#include <apt-pkg/fileutl.h>
 
-#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+#include <string>
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
@@ -120,7 +122,7 @@ bool ExtractTar::StartGzip()
    int Pipes[2];
    if (pipe(Pipes) != 0)
       return _error->Errno("pipe",_("Failed to create pipes"));
-   
+
    // Fork off the process
    GZPid = ExecFork();
 
@@ -136,9 +138,9 @@ bool ExtractTar::StartGzip()
       dup2(Fd,STDERR_FILENO);
       close(Fd);
       SetCloseExec(STDOUT_FILENO,false);
-      SetCloseExec(STDIN_FILENO,false);      
+      SetCloseExec(STDIN_FILENO,false);
       SetCloseExec(STDERR_FILENO,false);
-      
+
       const char *Args[3];
       string confvar = string("dir::bin::") + DecompressProg;
       string argv0 = _config->Find(confvar.c_str(),DecompressProg.c_str());
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index a811bbe88..a63cb6716 100644
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -21,11 +21,17 @@
 #include <apt-pkg/debfile.h>
 #include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/deblistparser.h>
 #include <apt-pkg/aptconfiguration.h>
-
+#include <apt-pkg/arfile.h>
+#include <apt-pkg/dirstream.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/tagfile.h>
+
+#include <string.h>
+#include <string>
+#include <vector>
 #include <sys/stat.h>
-#include <unistd.h>
+
 #include <apti18n.h>
 									/*}}}*/
 
@@ -118,8 +124,10 @@ bool debDebFile::ExtractTarMember(pkgDirStream &Stream,const char *Name)
    {
       std::string ext = std::string(Name) + ".{";
       for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
-	   c != compressor.end(); ++c)
-	 ext.append(c->Extension.substr(1));
+	   c != compressor.end(); ++c) {
+	 if (!c->Extension.empty())
+	    ext.append(c->Extension.substr(1));
+      }
       ext.append("}");
       return _error->Error(_("Internal error, could not locate member %s"), ext.c_str());
    }
@@ -194,7 +202,7 @@ bool debDebFile::MemControlExtract::DoItem(Item &Itm,int &Fd)
 // ---------------------------------------------------------------------
 /* Just memcopy the block from the tar extractor and put it in the right
    place in the pre-allocated memory block. */
-bool debDebFile::MemControlExtract::Process(Item &Itm,const unsigned char *Data,
+bool debDebFile::MemControlExtract::Process(Item &/*Itm*/,const unsigned char *Data,
 			     unsigned long Size,unsigned long Pos)
 {
    memcpy(Control + Pos, Data,Size);
diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index ecef71d21..880bcf6c5 100644
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -27,11 +27,15 @@
 #include <apt-pkg/arfile.h>
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/tagfile.h>
-#include <apt-pkg/pkgcache.h>
+
+#include <string>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/md5.h>
 #endif
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/pkgcache.h>
+#endif
 
 class FileFd;
 
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index e06c30a57..39ebb3bb4 100644
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -18,7 +18,6 @@
 
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/time.h>
 #include <errno.h>
 #include <unistd.h>
@@ -110,7 +109,7 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd)
 // DirStream::Fail - Failed processing a file				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool pkgDirStream::Fail(Item &Itm,int Fd)
+bool pkgDirStream::Fail(Item &/*Itm*/, int Fd)
 {
    if (Fd < 0)
       return true;
diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h
index 9d1af2188..1be2688a1 100644
--- a/apt-inst/dirstream.h
+++ b/apt-inst/dirstream.h
@@ -49,8 +49,8 @@ class pkgDirStream
    virtual bool DoItem(Item &Itm,int &Fd);
    virtual bool Fail(Item &Itm,int Fd);
    virtual bool FinishedFile(Item &Itm,int Fd);
-   virtual bool Process(Item &Itm,const unsigned char *Data,
-			unsigned long Size,unsigned long Pos) {return true;};
+   virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/,
+			unsigned long /*Size*/,unsigned long /*Pos*/) {return true;};
       
    virtual ~pkgDirStream() {};   
 };
diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc
index b3dfccfc6..b60784450 100644
--- a/apt-inst/extract.cc
+++ b/apt-inst/extract.cc
@@ -50,13 +50,20 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/dirstream.h>
+#include <apt-pkg/filelist.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
+#include <string.h>
+#include <string>
 #include <sys/stat.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <dirent.h>
 #include <iostream>
+
 #include <apti18n.h>
 									/*}}}*/
 using namespace std;
@@ -79,7 +86,7 @@ pkgExtract::pkgExtract(pkgFLCache &FLCache,pkgCache::VerIterator Ver) :
 // Extract::DoItem - Handle a single item from the stream		/*{{{*/
 // ---------------------------------------------------------------------
 /* This performs the setup for the extraction.. */
-bool pkgExtract::DoItem(Item &Itm,int &Fd)
+bool pkgExtract::DoItem(Item &Itm, int &/*Fd*/)
 {
    /* Strip any leading/trailing /s from the filename, then copy it to the
       temp buffer and re-apply the leading / We use a class variable
@@ -253,7 +260,7 @@ bool pkgExtract::DoItem(Item &Itm,int &Fd)
 // Extract::Finished - Sequence finished, erase the temp files		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool pkgExtract::Finished()
+APT_CONST bool pkgExtract::Finished()
 {
    return true;
 }
diff --git a/apt-inst/extract.h b/apt-inst/extract.h
index 7143fa409..8ad9ac629 100644
--- a/apt-inst/extract.h
+++ b/apt-inst/extract.h
@@ -17,11 +17,12 @@
 #ifndef PKGLIB_EXTRACT_H
 #define PKGLIB_EXTRACT_H
 
-
-
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/filelist.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <string>
 
 class pkgExtract : public pkgDirStream
 {
diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc
index defc4f4df..4dbc4a2d7 100644
--- a/apt-inst/filelist.cc
+++ b/apt-inst/filelist.cc
@@ -39,8 +39,6 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <iostream>
 #include <apti18n.h>
@@ -87,7 +85,7 @@ pkgFLCache::Header::Header()
 // FLCache::Header::CheckSizes - Check if the two headers have same *sz	/*{{{*/
 // ---------------------------------------------------------------------
 /* Compare to make sure we are matching versions */
-bool pkgFLCache::Header::CheckSizes(Header &Against) const
+APT_PURE bool pkgFLCache::Header::CheckSizes(Header &Against) const
 {
    if (HeaderSz == Against.HeaderSz &&
        NodeSz == Against.NodeSz &&
@@ -355,7 +353,7 @@ pkgFLCache::NodeIterator pkgFLCache::GetNode(const char *Name,
 // ---------------------------------------------------------------------
 /* This is one of two hashing functions. The other is inlined into the
    GetNode routine. */
-pkgFLCache::Node *pkgFLCache::HashNode(NodeIterator const &Nde)
+APT_PURE pkgFLCache::Node *pkgFLCache::HashNode(NodeIterator const &Nde)
 {
    // Hash the node
    unsigned long HashPos = 0;
@@ -572,7 +570,7 @@ bool pkgFLCache::AddConfFile(const char *Name,const char *NameEnd,
 // ---------------------------------------------------------------------
 /* Since the package pointer is indirected in all sorts of interesting ways
    this is used to get a pointer to the owning package */
-pkgFLCache::Package *pkgFLCache::NodeIterator::RealPackage() const
+APT_PURE pkgFLCache::Package *pkgFLCache::NodeIterator::RealPackage() const
 {
    if (Nde->Pointer == 0)
       return 0;
diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h
index 0405d61df..8c4891bcf 100644
--- a/apt-inst/filelist.h
+++ b/apt-inst/filelist.h
@@ -42,25 +42,25 @@ class pkgFLCache
    struct Package;
    struct Diversion;
    struct ConfFile;
-   
+
    class NodeIterator;
    class DirIterator;
    class PkgIterator;
    class DiverIterator;
-   
+
    protected:
    std::string CacheFile;
    DynamicMMap &Map;
    map_ptrloc LastTreeLookup;
    unsigned long LastLookupSize;
-   
+
    // Helpers for the addition algorithms
    map_ptrloc TreeLookup(map_ptrloc *Base,const char *Text,const char *TextEnd,
 			 unsigned long Size,unsigned int *Count = 0,
 			 bool Insert = false);
-   
+
    public:
-   
+
    // Pointers to the arrays of items
    Header *HeaderP;
    Node *NodeP;
@@ -70,10 +70,10 @@ class pkgFLCache
    ConfFile *ConfP;
    char *StrP;
    unsigned char *AnyP;
-   
+
    // Quick accessors
    Node *FileHash;
-   
+
    // Accessors
    Header &Head() {return *HeaderP;};
    void PrintTree(map_ptrloc Base,unsigned long Size);
@@ -89,7 +89,7 @@ class pkgFLCache
    void DropNode(map_ptrloc Node);
 
    inline DiverIterator DiverBegin();
-   
+
    // Diversion control
    void BeginDiverLoad();
    void FinishDiverLoad();
@@ -97,7 +97,7 @@ class pkgFLCache
 		     const char *To);
    bool AddConfFile(const char *Name,const char *NameEnd,
 		    PkgIterator const &Owner,const unsigned char *Sum);
-			     
+
    pkgFLCache(DynamicMMap &Map);
 //   ~pkgFLCache();
 };
@@ -109,7 +109,7 @@ struct pkgFLCache::Header
    short MajorVersion;
    short MinorVersion;
    bool Dirty;
-   
+
    // Size of structure values
    unsigned HeaderSz;
    unsigned NodeSz;
@@ -117,7 +117,7 @@ struct pkgFLCache::Header
    unsigned PackageSz;
    unsigned DiversionSz;
    unsigned ConfFileSz;
-   
+
    // Structure Counts;
    unsigned int NodeCount;
    unsigned int DirCount;
@@ -126,13 +126,13 @@ struct pkgFLCache::Header
    unsigned int ConfFileCount;
    unsigned int HashSize;
    unsigned long UniqNodes;
-      
+
    // Offsets
    map_ptrloc FileHash;
    map_ptrloc DirTree;
    map_ptrloc Packages;
    map_ptrloc Diversions;
-      
+
    /* Allocation pools, there should be one of these for each structure
       excluding the header */
    DynamicMMap::Pool Pools[5];
@@ -177,7 +177,7 @@ struct pkgFLCache::Diversion
    map_ptrloc OwnerPkg;       // Package
    map_ptrloc DivertFrom;     // Node
    map_ptrloc DivertTo;       // String
-   
+
    map_ptrloc Next;           // Diversion
    unsigned long Flags;
 
@@ -194,120 +194,120 @@ class pkgFLCache::PkgIterator
 {
    Package *Pkg;
    pkgFLCache *Owner;
-   
+
    public:
-   
+
    inline bool end() const {return Owner == 0 || Pkg == Owner->PkgP?true:false;}
-   
+
    // Accessors
-   inline Package *operator ->() {return Pkg;};
-   inline Package const *operator ->() const {return Pkg;};
-   inline Package const &operator *() const {return *Pkg;};
-   inline operator Package *() {return Pkg == Owner->PkgP?0:Pkg;};
-   inline operator Package const *() const {return Pkg == Owner->PkgP?0:Pkg;};
-
-   inline unsigned long Offset() const {return Pkg - Owner->PkgP;};
-   inline const char *Name() const {return Pkg->Name == 0?0:Owner->StrP + Pkg->Name;};
+   inline Package *operator ->() {return Pkg;}
+   inline Package const *operator ->() const {return Pkg;}
+   inline Package const &operator *() const {return *Pkg;}
+   inline operator Package *() {return Pkg == Owner->PkgP?0:Pkg;}
+   inline operator Package const *() const {return Pkg == Owner->PkgP?0:Pkg;}
+
+   inline unsigned long Offset() const {return Pkg - Owner->PkgP;}
+   inline const char *Name() const {return Pkg->Name == 0?0:Owner->StrP + Pkg->Name;}
    inline pkgFLCache::NodeIterator Files() const;
 
-   PkgIterator() : Pkg(0), Owner(0) {};
-   PkgIterator(pkgFLCache &Owner,Package *Trg) : Pkg(Trg), Owner(&Owner) {};
+   PkgIterator() : Pkg(0), Owner(0) {}
+   PkgIterator(pkgFLCache &Owner,Package *Trg) : Pkg(Trg), Owner(&Owner) {}
 };
 
 class pkgFLCache::DirIterator
 {
    Directory *Dir;
    pkgFLCache *Owner;
-   
+
    public:
-   
+
    // Accessors
-   inline Directory *operator ->() {return Dir;};
-   inline Directory const *operator ->() const {return Dir;};
-   inline Directory const &operator *() const {return *Dir;};
-   inline operator Directory *() {return Dir == Owner->DirP?0:Dir;};
-   inline operator Directory const *() const {return Dir == Owner->DirP?0:Dir;};
+   inline Directory *operator ->() {return Dir;}
+   inline Directory const *operator ->() const {return Dir;}
+   inline Directory const &operator *() const {return *Dir;}
+   inline operator Directory *() {return Dir == Owner->DirP?0:Dir;}
+   inline operator Directory const *() const {return Dir == Owner->DirP?0:Dir;}
 
-   inline const char *Name() const {return Dir->Name == 0?0:Owner->StrP + Dir->Name;};
+   inline const char *Name() const {return Dir->Name == 0?0:Owner->StrP + Dir->Name;}
 
-   DirIterator() : Dir(0), Owner(0) {};
-   DirIterator(pkgFLCache &Owner,Directory *Trg) : Dir(Trg), Owner(&Owner) {};
+   DirIterator() : Dir(0), Owner(0) {}
+   DirIterator(pkgFLCache &Owner,Directory *Trg) : Dir(Trg), Owner(&Owner) {}
 };
 
 class pkgFLCache::DiverIterator
 {
    Diversion *Diver;
    pkgFLCache *Owner;
-   
+
    public:
 
    // Iteration
-   void operator ++(int) {if (Diver != Owner->DiverP) Diver = Owner->DiverP + Diver->Next;};
-   inline void operator ++() {operator ++(0);};
-   inline bool end() const {return Owner == 0 || Diver == Owner->DiverP;};
+   void operator ++(int) {if (Diver != Owner->DiverP) Diver = Owner->DiverP + Diver->Next;}
+   inline void operator ++() {operator ++(0);}
+   inline bool end() const {return Owner == 0 || Diver == Owner->DiverP;}
 
    // Accessors
-   inline Diversion *operator ->() {return Diver;};
-   inline Diversion const *operator ->() const {return Diver;};
-   inline Diversion const &operator *() const {return *Diver;};
-   inline operator Diversion *() {return Diver == Owner->DiverP?0:Diver;};
-   inline operator Diversion const *() const {return Diver == Owner->DiverP?0:Diver;};
+   inline Diversion *operator ->() {return Diver;}
+   inline Diversion const *operator ->() const {return Diver;}
+   inline Diversion const &operator *() const {return *Diver;}
+   inline operator Diversion *() {return Diver == Owner->DiverP?0:Diver;}
+   inline operator Diversion const *() const {return Diver == Owner->DiverP?0:Diver;}
 
-   inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Diver->OwnerPkg);};
+   inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Diver->OwnerPkg);}
    inline NodeIterator DivertFrom() const;
    inline NodeIterator DivertTo() const;
 
    DiverIterator() : Diver(0), Owner(0) {};
-   DiverIterator(pkgFLCache &Owner,Diversion *Trg) : Diver(Trg), Owner(&Owner) {};
+   DiverIterator(pkgFLCache &Owner,Diversion *Trg) : Diver(Trg), Owner(&Owner) {}
 };
 
 class pkgFLCache::NodeIterator
 {
    Node *Nde;
-   enum {NdePkg, NdeHash} Type;   
+   enum {NdePkg, NdeHash} Type;
    pkgFLCache *Owner;
-   
+
    public:
-   
+
    // Iteration
-   void operator ++(int) {if (Nde != Owner->NodeP) Nde = Owner->NodeP + 
-	 (Type == NdePkg?Nde->NextPkg:Nde->Next);};
-   inline void operator ++() {operator ++(0);};
-   inline bool end() const {return Owner == 0 || Nde == Owner->NodeP;};
+   void operator ++(int) {if (Nde != Owner->NodeP) Nde = Owner->NodeP +
+	 (Type == NdePkg?Nde->NextPkg:Nde->Next);}
+   inline void operator ++() {operator ++(0);}
+   inline bool end() const {return Owner == 0 || Nde == Owner->NodeP;}
 
    // Accessors
-   inline Node *operator ->() {return Nde;};
-   inline Node const *operator ->() const {return Nde;};
-   inline Node const &operator *() const {return *Nde;};
-   inline operator Node *() {return Nde == Owner->NodeP?0:Nde;};
-   inline operator Node const *() const {return Nde == Owner->NodeP?0:Nde;};
-   inline unsigned long Offset() const {return Nde - Owner->NodeP;};
-   inline DirIterator Dir() const {return DirIterator(*Owner,Owner->DirP + Nde->Dir);};
-   inline DiverIterator Diversion() const {return DiverIterator(*Owner,Owner->DiverP + Nde->Pointer);};
-   inline const char *File() const {return Nde->File == 0?0:Owner->StrP + Nde->File;};
-   inline const char *DirN() const {return Owner->StrP + Owner->DirP[Nde->Dir].Name;};
+   inline Node *operator ->() {return Nde;}
+   inline Node const *operator ->() const {return Nde;}
+   inline Node const &operator *() const {return *Nde;}
+   inline operator Node *() {return Nde == Owner->NodeP?0:Nde;}
+   inline operator Node const *() const {return Nde == Owner->NodeP?0:Nde;}
+   inline unsigned long Offset() const {return Nde - Owner->NodeP;}
+   inline DirIterator Dir() const {return DirIterator(*Owner,Owner->DirP + Nde->Dir);}
+   inline DiverIterator Diversion() const {return DiverIterator(*Owner,Owner->DiverP + Nde->Pointer);}
+   inline const char *File() const {return Nde->File == 0?0:Owner->StrP + Nde->File;}
+   inline const char *DirN() const {return Owner->StrP + Owner->DirP[Nde->Dir].Name;}
    Package *RealPackage() const;
-   
+
    NodeIterator() : Nde(0), Type(NdeHash), Owner(0) {};
-   NodeIterator(pkgFLCache &Owner) : Nde(Owner.NodeP), Type(NdeHash), Owner(&Owner) {};
-   NodeIterator(pkgFLCache &Owner,Node *Trg) : Nde(Trg), Type(NdeHash), Owner(&Owner) {};
-   NodeIterator(pkgFLCache &Owner,Node *Trg,Package *) : Nde(Trg), Type(NdePkg), Owner(&Owner) {};
+   NodeIterator(pkgFLCache &Owner) : Nde(Owner.NodeP), Type(NdeHash), Owner(&Owner) {}
+   NodeIterator(pkgFLCache &Owner,Node *Trg) : Nde(Trg), Type(NdeHash), Owner(&Owner) {}
+   NodeIterator(pkgFLCache &Owner,Node *Trg,Package *) : Nde(Trg), Type(NdePkg), Owner(&Owner) {}
 };
 
 /* Inlines with forward references that cannot be included directly in their
    respsective classes */
-inline pkgFLCache::NodeIterator pkgFLCache::DiverIterator::DivertFrom() const 
-   {return NodeIterator(*Owner,Owner->NodeP + Diver->DivertFrom);};
+inline pkgFLCache::NodeIterator pkgFLCache::DiverIterator::DivertFrom() const
+   {return NodeIterator(*Owner,Owner->NodeP + Diver->DivertFrom);}
 inline pkgFLCache::NodeIterator pkgFLCache::DiverIterator::DivertTo() const
-   {return NodeIterator(*Owner,Owner->NodeP + Diver->DivertTo);};
+   {return NodeIterator(*Owner,Owner->NodeP + Diver->DivertTo);}
 
 inline pkgFLCache::NodeIterator pkgFLCache::PkgIterator::Files() const
-   {return NodeIterator(*Owner,Owner->NodeP + Pkg->Files,Pkg);};
+   {return NodeIterator(*Owner,Owner->NodeP + Pkg->Files,Pkg);}
 
 inline pkgFLCache::DiverIterator pkgFLCache::DiverBegin()
-   {return DiverIterator(*this,DiverP + HeaderP->Diversions);};
+   {return DiverIterator(*this,DiverP + HeaderP->Diversions);}
 
-inline pkgFLCache::PkgIterator pkgFLCache::GetPkg(const char *Name,bool Insert) 
-   {return GetPkg(Name,Name+strlen(Name),Insert);};
+inline pkgFLCache::PkgIterator pkgFLCache::GetPkg(const char *Name,bool Insert)
+   {return GetPkg(Name,Name+strlen(Name),Insert);}
 
 #endif
diff --git a/apt-inst/makefile b/apt-inst/makefile
index da983df5f..af887bba8 100644
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -20,15 +20,7 @@ SLIBS=$(PTHREADLIB) -lapt-pkg
 APT_DOMAIN:=libapt-inst$(MAJOR)
 LIBRARYDEPENDS=$(LIB)/libapt-pkg.so
 
-# Source code for the contributed non-core things
-SOURCE = contrib/extracttar.cc contrib/arfile.cc
+SOURCE = $(wildcard *.cc */*.cc)
+HEADERS = $(addprefix apt-pkg/,$(notdir $(wildcard *.h */*.h)))
 
-# Source code for the main library
-SOURCE+= filelist.cc dirstream.cc extract.cc deb/debfile.cc
-
-# Public header files
-HEADERS = extracttar.h arfile.h filelist.h extract.h \
-          dirstream.h debfile.h
-
-HEADERS := $(addprefix apt-pkg/,$(HEADERS))
 include $(LIBRARY_H)
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 230d5aba9..f8a652534 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -22,12 +22,21 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/indexrecords.h>
-#include <apt-pkg/metaindex.h>
-
+#include <apt-pkg/acquire.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgrecords.h>
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <iostream>
+#include <vector>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
@@ -108,8 +117,8 @@ void pkgAcquire::Item::Start(string /*Message*/,unsigned long long Size)
 // Acquire::Item::Done - Item downloaded OK				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void pkgAcquire::Item::Done(string Message,unsigned long long Size,string Hash,
-			    pkgAcquire::MethodConfig *Cnf)
+void pkgAcquire::Item::Done(string Message,unsigned long long Size,string /*Hash*/,
+			    pkgAcquire::MethodConfig * /*Cnf*/)
 {
    // We just downloaded something..
    string FileName = LookupTag(Message,"Filename");
@@ -253,10 +262,10 @@ string pkgAcqSubIndex::Custom600Headers()
    return "\nIndex-File: true\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 }
 									/*}}}*/
-void pkgAcqSubIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)	/*{{{*/
+void pkgAcqSubIndex::Failed(string Message,pkgAcquire::MethodConfig * /*Cnf*/)/*{{{*/
 {
    if(Debug)
-      std::clog << "pkgAcqSubIndex failed: " << Desc.URI << std::endl;
+      std::clog << "pkgAcqSubIndex failed: " << Desc.URI << " with " << Message << std::endl;
 
    Complete = false;
    Status = StatDone;
@@ -544,10 +553,10 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)		/*{{{*/
    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
+      std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << " with " << Message << std::endl
 		<< "Falling back to normal index file acquire" << std::endl;
 
    new pkgAcqIndex(Owner, RealURI, Description, Desc.ShortDesc, 
@@ -624,10 +633,10 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner,
    }
 }
 									/*}}}*/
-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
+      std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << " with " << Message << std::endl
 		<< "Falling back to normal index file acquire" << std::endl;
    new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, 
 		   ExpectedHash);
@@ -709,7 +718,7 @@ bool pkgAcqIndexDiffs::QueueNextDiff()					/*{{{*/
    }
 
    // queue the right diff
-   Desc.URI = string(RealURI) + ".diff/" + available_patches[0].file + ".gz";
+   Desc.URI = RealURI + ".diff/" + available_patches[0].file + ".gz";
    Desc.Description = Description + " " + available_patches[0].file + string(".pdiff");
    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(RealURI + ".diff/" + available_patches[0].file);
@@ -797,7 +806,7 @@ pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire *Owner,
    Desc.Owner = this;
    Desc.ShortDesc = ShortDesc;
 
-   Desc.URI = string(RealURI) + ".diff/" + patch.file + ".gz";
+   Desc.URI = RealURI + ".diff/" + patch.file + ".gz";
    Desc.Description = Description + " " + patch.file + string(".pdiff");
    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(RealURI + ".diff/" + patch.file);
@@ -808,7 +817,7 @@ pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire *Owner,
    QueueURI(Desc);
 }
 									/*}}}*/
-void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
+void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig * /*Cnf*/)/*{{{*/
 {
    if(Debug)
       std::clog << "pkgAcqIndexMergeDiffs failed: " << Desc.URI << " with " << Message << std::endl;
@@ -1569,7 +1578,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)				/*{{{*/
 	 {
 	    std::vector<std::string> types = APT::Configuration::getCompressionTypes();
 	    for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
-	       if (MetaIndexParser->Exists(string((*Target)->MetaKey).append(".").append(*t)) == true)
+	       if (MetaIndexParser->Exists((*Target)->MetaKey + "." + *t) == true)
 	       {
 		  compressedAvailable = true;
 		  break;
@@ -1607,7 +1616,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)				/*{{{*/
 	 else if (transInRelease == false || Record != NULL || compressedAvailable == true)
 	 {
 	    if (_config->FindB("Acquire::PDiffs",true) == true && transInRelease == true &&
-		MetaIndexParser->Exists(string((*Target)->MetaKey).append(".diff/Index")) == true)
+		MetaIndexParser->Exists((*Target)->MetaKey + ".diff/Index") == true)
 	       new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description,
 				   (*Target)->ShortDesc, ExpectedIndexHash);
 	    else
@@ -1621,7 +1630,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)				/*{{{*/
          in the Meta-Index file. Ideal would be if pkgAcqDiffIndex would test this
          instead, but passing the required info to it is to much hassle */
       if(_config->FindB("Acquire::PDiffs",true) == true && (verify == false ||
-	  MetaIndexParser->Exists(string((*Target)->MetaKey).append(".diff/Index")) == true))
+	  MetaIndexParser->Exists((*Target)->MetaKey + ".diff/Index") == true))
 	 new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description,
 			     (*Target)->ShortDesc, ExpectedIndexHash);
       else
@@ -1646,7 +1655,7 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message)			/*{{{*/
       missingkeys += (Fingerprint);
    }
    if(!missingkeys.empty())
-      _error->Warning("%s", string(msg+missingkeys).c_str());
+      _error->Warning("%s", (msg + missingkeys).c_str());
 
    string Transformed = MetaIndexParser->GetExpectedDist();
 
@@ -1709,7 +1718,7 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message)			/*{{{*/
 // pkgAcqMetaIndex::Failed - no Release file present or no signature file present	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
+void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig * /*Cnf*/)
 {
    if (AuthPass == true)
    {
@@ -1867,7 +1876,7 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources,
       _error->Error(_("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)"),
-		    Version.ParentPkg().Name());
+		    Version.ParentPkg().FullName().c_str());
       return;
    }
    
@@ -1995,7 +2004,7 @@ bool pkgAcqArchive::QueueNext()
       Desc.URI = Index->ArchiveURI(PkgFile);
       Desc.Description = Index->ArchiveInfo(Version);
       Desc.Owner = this;
-      Desc.ShortDesc = Version.ParentPkg().Name();
+      Desc.ShortDesc = Version.ParentPkg().FullName(true);
 
       // See if we already have the file. (Legacy filenames)
       FileSize = Version->Size;
@@ -2062,10 +2071,6 @@ bool pkgAcqArchive::QueueNext()
 
       // Create the item
       Local = false;
-      Desc.URI = Index->ArchiveURI(PkgFile);
-      Desc.Description = Index->ArchiveInfo(Version);
-      Desc.Owner = this;
-      Desc.ShortDesc = Version.ParentPkg().Name();
       QueueURI(Desc);
 
       ++Vf;
@@ -2164,7 +2169,7 @@ void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 									/*}}}*/
 // AcqArchive::IsTrusted - Determine whether this archive comes from a trusted source /*{{{*/
 // ---------------------------------------------------------------------
-bool pkgAcqArchive::IsTrusted()
+APT_PURE bool pkgAcqArchive::IsTrusted()
 {
    return Trusted;
 }
@@ -2212,7 +2217,7 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash,
    if (stat(DestFile.c_str(),&Buf) == 0)
    {
       // Hmm, the partial file is too big, erase it
-      if ((unsigned long long)Buf.st_size > Size)
+      if ((Size > 0) && (unsigned long long)Buf.st_size > Size)
 	 unlink(DestFile.c_str());
       else
 	 PartialSize = Buf.st_size;
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 5a1c7979c..f48d2a0d7 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -24,6 +24,10 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/weakptr.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <string>
+#include <vector>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/indexfile.h>
@@ -64,7 +68,7 @@ class pkgAcquire::Item : public WeakPointable
 
    /** \brief Insert this item into its owner's queue.
     *
-    *  \param ItemDesc Metadata about this item (its URI and
+    *  \param Item Metadata about this item (its URI and
     *  description).
     */
    inline void QueueURI(ItemDesc &Item)
@@ -79,7 +83,7 @@ class pkgAcquire::Item : public WeakPointable
     *
     *  \param From The file to be renamed.
     *
-    *  \param To The new name of #From.  If #To exists it will be
+    *  \param To The new name of \a From.  If \a To exists it will be
     *  overwritten.
     */
    void Rename(std::string From,std::string To);
@@ -115,7 +119,7 @@ class pkgAcquire::Item : public WeakPointable
      } Status;
 
    /** \brief Contains a textual description of the error encountered
-    *  if #Status is #StatError or #StatAuthError.
+    *  if #ItemState is #StatError or #StatAuthError.
     */
    std::string ErrorText;
 
@@ -293,7 +297,6 @@ class pkgAcquire::Item : public WeakPointable
    /** \brief Rename failed file and set error
     *
     * \param state respresenting the error we encountered
-    * \param errorMsg a message describing the error
     */
    bool RenameOnError(RenameOnErrorState const state);
 };
@@ -636,7 +639,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
    /** \brief Create an index diff item.
     *
     *  After filling in its basic fields, this invokes Finish(true) if
-    *  #diffs is empty, or QueueNextDiff() otherwise.
+    *  \a diffs is empty, or QueueNextDiff() otherwise.
     *
     *  \param Owner The pkgAcquire object that owns this item.
     *
@@ -651,6 +654,8 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
     *  reconstructed package index file; the index file will be tested
     *  against this value when it is entirely reconstructed.
     *
+    *  \param ServerSha1 is the sha1sum of the current file on the server
+    *
     *  \param diffs The remaining diffs from the index of diffs.  They
     *  should be ordered so that each diff appears before any diff
     *  that depends on it.
@@ -1162,8 +1167,8 @@ class pkgAcqFile : public pkgAcquire::Item
     *  \param IsIndexFile The file is considered a IndexFile and cache-control
     *                     headers like "cache-control: max-age=0" are send
     *
-    * If DestFilename is empty, download to DestDir/<basename> if
-    * DestDir is non-empty, $CWD/<basename> otherwise.  If
+    * If DestFilename is empty, download to DestDir/\<basename\> if
+    * DestDir is non-empty, $CWD/\<basename\> otherwise.  If
     * DestFilename is NOT empty, DestDir is ignored and DestFilename
     * is the absolute name to which the file should be downloaded.
     */
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 5bc1c159a..746c553f1 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -23,10 +23,18 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
-
+#include <apt-pkg/md5.h>
+#include <apt-pkg/sha1.h>
+#include <apt-pkg/sha2.h>
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <string>
+#include <vector>
 #include <iostream>
 #include <stdio.h>
-#include <sys/signal.h>
 									/*}}}*/
 
 using namespace std;
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 00f99e0a0..221ccf273 100644
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -20,7 +20,10 @@
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
+#include <apt-pkg/macros.h>
+
 #include <stdarg.h>
+#include <time.h>
 
 #include <string>
 #include <vector>
@@ -106,7 +109,7 @@ class pkgAcqMethod
    virtual ~pkgAcqMethod() {};
 
    private:
-   void Dequeue();
+   APT_HIDDEN void Dequeue();
 };
 
 /** @} */
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index de62080da..047a655ce 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -14,20 +14,23 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
+#include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/hashes.h>
 
+#include <string>
+#include <vector>
 #include <iostream>
 #include <sstream>
-#include <fstream>
 
 #include <sys/stat.h>
+#include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h
index 848a6bad7..67aee4b59 100644
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@ -22,6 +22,9 @@
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/weakptr.h>
 
+#include <sys/types.h>
+#include <string>
+#include <vector>
 
 /** \brief A fetch subprocess.
  *
@@ -136,8 +139,8 @@ class pkgAcquire::Worker : public WeakPointable
    
    /** \brief Retrieve any available messages from the subprocess.
     *
-    *  The messages are retrieved as in ::ReadMessages(), and
-    *  MessageFailure() is invoked if an error occurs; in particular,
+    *  The messages are retrieved as in \link strutl.h ReadMessages()\endlink, and
+    *  #MethodFailure() is invoked if an error occurs; in particular,
     *  if the pipe to the subprocess dies unexpectedly while a message
     *  is being read.
     *
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 120e809e1..a187a00ae 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -23,12 +23,18 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 
+#include <string>
+#include <vector>
 #include <iostream>
 #include <sstream>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <dirent.h>
 #include <sys/time.h>
+#include <sys/select.h>
 #include <errno.h>
 
 #include <apti18n.h>
@@ -468,7 +474,7 @@ void pkgAcquire::Bump()
 pkgAcquire::Worker *pkgAcquire::WorkerStep(Worker *I)
 {
    return I->NextAcquire;
-};
+}
 									/*}}}*/
 // Acquire::Clean - Cleans a directory					/*{{{*/
 // ---------------------------------------------------------------------
@@ -520,7 +526,7 @@ bool pkgAcquire::Clean(string Dir)
 // Acquire::TotalNeeded - Number of bytes to fetch			/*{{{*/
 // ---------------------------------------------------------------------
 /* This is the total number of bytes needed */
-unsigned long long pkgAcquire::TotalNeeded()
+APT_PURE unsigned long long pkgAcquire::TotalNeeded()
 {
    unsigned long long Total = 0;
    for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); ++I)
@@ -531,7 +537,7 @@ unsigned long long pkgAcquire::TotalNeeded()
 // Acquire::FetchNeeded - Number of bytes needed to get			/*{{{*/
 // ---------------------------------------------------------------------
 /* This is the number of bytes that is not local */
-unsigned long long pkgAcquire::FetchNeeded()
+APT_PURE unsigned long long pkgAcquire::FetchNeeded()
 {
    unsigned long long Total = 0;
    for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); ++I)
@@ -543,7 +549,7 @@ unsigned long long pkgAcquire::FetchNeeded()
 // Acquire::PartialPresent - Number of partial bytes we already have	/*{{{*/
 // ---------------------------------------------------------------------
 /* This is the number of bytes that is not local */
-unsigned long long pkgAcquire::PartialPresent()
+APT_PURE unsigned long long pkgAcquire::PartialPresent()
 {
   unsigned long long Total = 0;
    for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); ++I)
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 3d5d7a4b7..ef16d8556 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -72,8 +72,13 @@
 #include <vector>
 #include <string>
 
+#include <stddef.h>
 #include <sys/time.h>
+#include <sys/select.h>
+
+#ifndef APT_10_CLEANER_HEADERS
 #include <unistd.h>
+#endif
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::vector;
@@ -282,18 +287,18 @@ class pkgAcquire
     */
    void Shutdown();
    
-   /** \brief Get the first #Worker object.
+   /** \brief Get the first Worker object.
     *
     *  \return the first active worker in this download process.
     */
    inline Worker *WorkersBegin() {return Workers;};
 
-   /** \brief Advance to the next #Worker object.
+   /** \brief Advance to the next Worker object.
     *
     *  \return the worker immediately following I, or \b NULL if none
     *  exists.
     */
-   Worker *WorkerStep(Worker *I);
+   Worker *WorkerStep(Worker *I) APT_PURE;
 
    /** \brief Get the head of the list of items. */
    inline ItemIterator ItemsBegin() {return Items.begin();};
@@ -353,7 +358,7 @@ class pkgAcquire
    void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
 
    /** \brief Construct a new pkgAcquire. */
-   pkgAcquire(pkgAcquireStatus *Log) __deprecated;
+   pkgAcquire(pkgAcquireStatus *Log) APT_DEPRECATED;
    pkgAcquire();
 
    /** \brief Destroy this pkgAcquire object.
@@ -476,7 +481,7 @@ class pkgAcquire::Queue
     *  \return the first item in the queue whose URI is #URI and that
     *  is being downloaded by #Owner.
     */
-   QItem *FindItem(std::string URI,pkgAcquire::Worker *Owner);
+   QItem *FindItem(std::string URI,pkgAcquire::Worker *Owner) APT_PURE;
 
    /** Presumably this should start downloading an item?
     *
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 0363ab3e2..608ec7fce 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -19,19 +19,18 @@
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/version.h>
 #include <apt-pkg/sptr.h>
-#include <apt-pkg/acquire-item.h>
 #include <apt-pkg/edsp.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/progress.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/packagemanager.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
-#include <sys/types.h>
+#include <string.h>
+#include <string>
 #include <cstdlib>
-#include <algorithm>
 #include <iostream>
-#include <stdio.h>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -394,8 +393,18 @@ void pkgProblemResolver::MakeScores()
    };
    int PrioEssentials = _config->FindI("pkgProblemResolver::Scores::Essentials",100);
    int PrioInstalledAndNotObsolete = _config->FindI("pkgProblemResolver::Scores::NotObsolete",1);
-   int PrioDepends = _config->FindI("pkgProblemResolver::Scores::Depends",1);
-   int PrioRecommends = _config->FindI("pkgProblemResolver::Scores::Recommends",1);
+   int DepMap[] = {
+      0,
+      _config->FindI("pkgProblemResolver::Scores::Depends",1),
+      _config->FindI("pkgProblemResolver::Scores::PreDepends",1),
+      _config->FindI("pkgProblemResolver::Scores::Suggests",0),
+      _config->FindI("pkgProblemResolver::Scores::Recommends",1),
+      _config->FindI("pkgProblemResolver::Scores::Conflicts",-1),
+      _config->FindI("pkgProblemResolver::Scores::Replaces",0),
+      _config->FindI("pkgProblemResolver::Scores::Obsoletes",0),
+      _config->FindI("pkgProblemResolver::Scores::Breaks",-1),
+      _config->FindI("pkgProblemResolver::Scores::Enhances",0)
+   };
    int AddProtected = _config->FindI("pkgProblemResolver::Scores::AddProtected",10000);
    int AddEssential = _config->FindI("pkgProblemResolver::Scores::AddEssential",5000);
 
@@ -408,8 +417,15 @@ void pkgProblemResolver::MakeScores()
          << "  Extra => " << PrioMap[pkgCache::State::Extra] << endl
          << "  Essentials => " << PrioEssentials << endl
          << "  InstalledAndNotObsolete => " << PrioInstalledAndNotObsolete << endl
-         << "  Depends => " << PrioDepends << endl
-         << "  Recommends => " << PrioRecommends << endl
+         << "  Pre-Depends => " << DepMap[pkgCache::Dep::PreDepends] << endl
+         << "  Depends => " << DepMap[pkgCache::Dep::Depends] << endl
+         << "  Recommends => " << DepMap[pkgCache::Dep::Recommends] << endl
+         << "  Suggests => " << DepMap[pkgCache::Dep::Suggests] << endl
+         << "  Conflicts => " << DepMap[pkgCache::Dep::Conflicts] << endl
+         << "  Breaks => " << DepMap[pkgCache::Dep::DpkgBreaks] << endl
+         << "  Replaces => " << DepMap[pkgCache::Dep::Replaces] << endl
+         << "  Obsoletes => " << DepMap[pkgCache::Dep::Obsoletes] << endl
+         << "  Enhances => " << DepMap[pkgCache::Dep::Enhances] << endl
          << "  AddProtected => " << AddProtected << endl
          << "  AddEssential => " << AddEssential << endl;
 
@@ -429,34 +445,36 @@ void pkgProblemResolver::MakeScores()
 	  || (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important)
 	 Score += PrioEssentials;
 
-      // We transform the priority
-      if (Cache[I].InstVerIter(Cache)->Priority <= 5)
-	 Score += PrioMap[Cache[I].InstVerIter(Cache)->Priority];
-      
+      pkgCache::VerIterator const InstVer = Cache[I].InstVerIter(Cache);
+      // We apply priorities only to downloadable packages, all others are prio:extra
+      // as an obsolete prio:standard package can't be that standard anymore…
+      if (InstVer->Priority <= pkgCache::State::Extra && InstVer.Downloadable() == true)
+	 Score += PrioMap[InstVer->Priority];
+      else
+	 Score += PrioMap[pkgCache::State::Extra];
+
       /* This helps to fix oddball problems with conflicting packages
-         on the same level. We enhance the score of installed packages 
-	 if those are not obsolete
-      */
+	 on the same level. We enhance the score of installed packages
+	 if those are not obsolete */
       if (I->CurrentVer != 0 && Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable())
 	 Score += PrioInstalledAndNotObsolete;
-   }
 
-   // Now that we have the base scores we go and propagate dependencies
-   for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
-   {
-      if (Cache[I].InstallVer == 0)
-	 continue;
-      
-      for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false; ++D)
+      // propagate score points along dependencies
+      for (pkgCache::DepIterator D = InstVer.DependsList(); D.end() == false; ++D)
       {
-	 if (D->Type == pkgCache::Dep::Depends || 
-	     D->Type == pkgCache::Dep::PreDepends)
-	    Scores[D.TargetPkg()->ID] += PrioDepends;
-	 else if (D->Type == pkgCache::Dep::Recommends)
-	    Scores[D.TargetPkg()->ID] += PrioRecommends;
+	 if (DepMap[D->Type] == 0)
+	    continue;
+	 pkgCache::PkgIterator const T = D.TargetPkg();
+	 if (D->Version != 0)
+	 {
+	    pkgCache::VerIterator const IV = Cache[T].InstVerIter(Cache);
+	    if (IV.end() == true || D.IsSatisfied(IV) != D.IsNegative())
+	       continue;
+	 }
+	 Scores[T->ID] += DepMap[D->Type];
       }
-   }   
-   
+   }
+
    // Copy the scores to advoid additive looping
    SPtrArray<int> OldScores = new int[Size];
    memcpy(OldScores,Scores,sizeof(*Scores)*Size);
@@ -869,8 +887,8 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
                }
 
 	       if (Debug == true)
-		  clog << "  Considering " << Pkg.FullName(false) << ' ' << (int)Scores[Pkg->ID] <<
-		  " as a solution to " << I.FullName(false) << ' ' << (int)Scores[I->ID] << endl;
+		  clog << "  Considering " << Pkg.FullName(false) << ' ' << Scores[Pkg->ID] <<
+		  " as a solution to " << I.FullName(false) << ' ' << Scores[I->ID] << endl;
 
 	       /* Try to fix the package under consideration rather than
 	          fiddle with the VList package */
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 489d81159..f35bd9a13 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -33,8 +33,11 @@
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
 #include <iostream>
+#include <string>
 
 #include <apt-pkg/macros.h>
 
@@ -111,7 +114,7 @@ class pkgProblemResolver						/*{{{*/
    
    // Sort stuff
    static pkgProblemResolver *This;
-   static int ScoreSort(const void *a,const void *b);
+   static int ScoreSort(const void *a,const void *b) APT_PURE;
 
    struct PackageKill
    {
@@ -140,7 +143,7 @@ class pkgProblemResolver						/*{{{*/
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
 
-   __deprecated void InstallProtect();
+   APT_DEPRECATED void InstallProtect();
 
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 0b0b546c5..9982759c6 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -17,14 +17,19 @@
 #include <apt-pkg/macros.h>
 #include <apt-pkg/strutl.h>
 
-#include <sys/types.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <fcntl.h>
-
+#include <ctype.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <algorithm>
 #include <string>
 #include <vector>
+
+#include <apti18n.h>
 									/*}}}*/
 namespace APT {
 // getCompressionTypes - Return Vector of usable compressiontypes	/*{{{*/
@@ -49,11 +54,6 @@ const Configuration::getCompressionTypes(bool const &Cached) {
 	setDefaultConfigurationForCompressors();
 	std::vector<APT::Configuration::Compressor> const compressors = getCompressors();
 
-	// accept non-list order as override setting for config settings on commandline
-	std::string const overrideOrder = _config->Find("Acquire::CompressionTypes::Order","");
-	if (overrideOrder.empty() == false)
-		types.push_back(overrideOrder);
-
 	// load the order setting into our vector
 	std::vector<std::string> const order = _config->FindVector("Acquire::CompressionTypes::Order");
 	for (std::vector<std::string>::const_iterator o = order.begin();
@@ -227,61 +227,11 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
 			}
 		}
 	} else {
+		// cornercase: LANG=C, so we use only "en" Translation
 		environment.push_back("en");
 	}
 
-	// Support settings like Acquire::Languages=none on the command line to
-	// override the configuration settings vector of languages.
-	string const forceLang = _config->Find("Acquire::Languages","");
-	if (forceLang.empty() == false) {
-		if (forceLang == "none") {
-			codes.clear();
-			allCodes.clear();
-			allCodes.push_back("none");
-		} else {
-			if (forceLang == "environment")
-				codes = environment;
-			else
-				codes.push_back(forceLang);
-			allCodes = codes;
-			for (std::vector<string>::const_iterator b = builtin.begin();
-			     b != builtin.end(); ++b)
-				if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end())
-					allCodes.push_back(*b);
-		}
-		if (All == true)
-			return allCodes;
-		else
-			return codes;
-	}
-
-	// cornercase: LANG=C, so we use only "en" Translation
-	if (envShort == "C") {
-		allCodes = codes = environment;
-		allCodes.insert(allCodes.end(), builtin.begin(), builtin.end());
-		if (All == true)
-			return allCodes;
-		else
-			return codes;
-	}
-
-	std::vector<string> const lang = _config->FindVector("Acquire::Languages");
-	// the default setting -> "environment, en"
-	if (lang.empty() == true) {
-		codes = environment;
-		if (envShort != "en")
-			codes.push_back("en");
-		allCodes = codes;
-		for (std::vector<string>::const_iterator b = builtin.begin();
-		     b != builtin.end(); ++b)
-			if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end())
-				allCodes.push_back(*b);
-		if (All == true)
-			return allCodes;
-		else
-			return codes;
-	}
-
+	std::vector<string> const lang = _config->FindVector("Acquire::Languages", "environment,en");
 	// the configs define the order, so add the environment
 	// then needed and ensure the codes are not listed twice.
 	bool noneSeen = false;
@@ -308,10 +258,15 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
 		allCodes.push_back(*l);
 	}
 
-	for (std::vector<string>::const_iterator b = builtin.begin();
-	     b != builtin.end(); ++b)
-		if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end())
-			allCodes.push_back(*b);
+	if (allCodes.empty() == false) {
+		for (std::vector<string>::const_iterator b = builtin.begin();
+		     b != builtin.end(); ++b)
+			if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end())
+				allCodes.push_back(*b);
+	} else {
+		// "none" was forced
+		allCodes.push_back("none");
+	}
 
 	if (All == true)
 		return allCodes;
@@ -320,7 +275,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
 }
 									/*}}}*/
 // checkLanguage - are we interested in the given Language?		/*{{{*/
-bool const Configuration::checkLanguage(std::string Lang, bool const All) {
+bool Configuration::checkLanguage(std::string Lang, bool const All) {
 	// the empty Language is always interesting as it is the original
 	if (Lang.empty() == true)
 		return true;
@@ -440,7 +395,7 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
 }
 									/*}}}*/
 // checkArchitecture - are we interested in the given Architecture?	/*{{{*/
-bool const Configuration::checkArchitecture(std::string const &Arch) {
+bool Configuration::checkArchitecture(std::string const &Arch) {
 	if (Arch == "all")
 		return true;
 	std::vector<std::string> const archs = getArchitectures(true);
@@ -476,7 +431,7 @@ void Configuration::setDefaultConfigurationForCompressors() {
 	}
 }
 									/*}}}*/
-// getCompressors - Return Vector of usbale compressors			/*{{{*/
+// getCompressors - Return Vector of usealbe compressors		/*{{{*/
 // ---------------------------------------------------------------------
 /* return a vector of compressors used by apt-ftparchive in the
    multicompress functionality or to detect data.tar files */
@@ -507,13 +462,21 @@ const Configuration::getCompressors(bool const Cached) {
 #endif
 	if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true)
 		compressors.push_back(Compressor("xz",".xz","xz","-6","-d",4));
+#ifdef HAVE_LZMA
+	else
+		compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 4));
+#endif
 	if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true)
 		compressors.push_back(Compressor("lzma",".lzma","lzma","-9","-d",5));
+#ifdef HAVE_LZMA
+	else
+		compressors.push_back(Compressor("lzma",".lzma","false", NULL, NULL, 5));
+#endif
 
 	std::vector<std::string> const comp = _config->FindVector("APT::Compressor");
 	for (std::vector<std::string>::const_iterator c = comp.begin();
 	     c != comp.end(); ++c) {
-		if (*c == "." || *c == "gzip" || *c == "bzip2" || *c == "lzma" || *c == "xz")
+		if (c->empty() || *c == "." || *c == "gzip" || *c == "bzip2" || *c == "lzma" || *c == "xz")
 			continue;
 		compressors.push_back(Compressor(c->c_str(), std::string(".").append(*c).c_str(), c->c_str(), "-9", "-d", 100));
 	}
@@ -558,4 +521,28 @@ Configuration::Compressor::Compressor(char const *name, char const *extension,
 		UncompressArgs.push_back(uncompressArg);
 }
 									/*}}}*/
+// getBuildProfiles - return a vector of enabled build profiles		/*{{{*/
+std::vector<std::string> const Configuration::getBuildProfiles() {
+	// order is: override value (~= commandline), environment variable, list (~= config file)
+	std::string profiles_env = getenv("DEB_BUILD_PROFILES") == 0 ? "" : getenv("DEB_BUILD_PROFILES");
+	if (profiles_env.empty() == false) {
+		profiles_env = SubstVar(profiles_env, " ", ",");
+		std::string const bp = _config->Find("APT::Build-Profiles");
+		_config->Clear("APT::Build-Profiles");
+		if (bp.empty() == false)
+			_config->Set("APT::Build-Profiles", bp);
+	}
+	return _config->FindVector("APT::Build-Profiles", profiles_env);
+}
+std::string const Configuration::getBuildProfilesString() {
+	std::vector<std::string> profiles = getBuildProfiles();
+	if (profiles.empty() == true)
+		return "";
+	std::vector<std::string>::const_iterator p = profiles.begin();
+	std::string list = *p;
+	for (; p != profiles.end(); ++p)
+	   list.append(",").append(*p);
+	return list;
+}
+									/*}}}*/
 }
diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h
index bf7deae85..dfed194ae 100644
--- a/apt-pkg/aptconfiguration.h
+++ b/apt-pkg/aptconfiguration.h
@@ -73,7 +73,7 @@ public:									/*{{{*/
 	 *  \param All defines if we check against all codes or only against used codes
 	 *  \return true if we are interested, false otherwise
 	 */
-	bool static const checkLanguage(std::string Lang, bool const All = false);
+	bool static checkLanguage(std::string Lang, bool const All = false);
 
 	/** \brief Returns a vector of Architectures we support
 	 *
@@ -89,7 +89,7 @@ public:									/*{{{*/
 	 *  \param Arch we want to check
 	 *  \return true if we are interested, false otherwise
 	 */
-	bool static const checkArchitecture(std::string const &Arch);
+	bool static checkArchitecture(std::string const &Arch);
 
 	/** \brief Representation of supported compressors */
 	struct Compressor {
@@ -117,6 +117,11 @@ public:									/*{{{*/
 
 	/** \brief Return a vector of extensions supported for data.tar's */
 	std::vector<std::string> static const getCompressorExtensions();
+
+	/** \return Return a vector of enabled build profile specifications */
+	std::vector<std::string> static const getBuildProfiles();
+	/** \return Return a comma-separated list of enabled build profile specifications */
+	std::string static const getBuildProfilesString();
 									/*}}}*/
 	private:							/*{{{*/
 	void static setDefaultConfigurationForCompressors();
diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 7c2276185..0fd40106f 100644
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -21,9 +21,16 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/acquire-item.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/progress.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
+
+#include <string.h>
+#include <unistd.h>
+#include <string>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -99,7 +106,7 @@ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock)
 // CacheFile::BuildSourceList - Open and build all relevant sources.list/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool pkgCacheFile::BuildSourceList(OpProgress *Progress)
+bool pkgCacheFile::BuildSourceList(OpProgress * /*Progress*/)
 {
    if (SrcList != NULL)
       return true;
@@ -113,7 +120,7 @@ bool pkgCacheFile::BuildSourceList(OpProgress *Progress)
 // CacheFile::BuildPolicy - Open and build all relevant preferences	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool pkgCacheFile::BuildPolicy(OpProgress *Progress)
+bool pkgCacheFile::BuildPolicy(OpProgress * /*Progress*/)
 {
    if (Policy != NULL)
       return true;
diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index 802b12b61..36b20893a 100644
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -17,8 +17,12 @@
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 
+#include <stddef.h>
+
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/acquire.h>
@@ -26,6 +30,7 @@
 #include <apt-pkg/sourcelist.h>
 #endif
 
+class MMap;
 class pkgPolicy;
 class pkgSourceList;
 class OpProgress;
@@ -60,13 +65,13 @@ class pkgCacheFile
    inline unsigned char &operator [](pkgCache::DepIterator const &I) {return (*DCache)[I];};
 
    bool BuildCaches(OpProgress *Progress = NULL,bool WithLock = true);
-   __deprecated bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); };
+   APT_DEPRECATED bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); };
    bool BuildSourceList(OpProgress *Progress = NULL);
    bool BuildPolicy(OpProgress *Progress = NULL);
    bool BuildDepCache(OpProgress *Progress = NULL);
    bool Open(OpProgress *Progress = NULL, bool WithLock = true);
    inline bool ReadOnlyOpen(OpProgress *Progress = NULL) { return Open(Progress, false); };
-   __deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); };
+   APT_DEPRECATED bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); };
    static void RemoveCaches();
    void Close();
 
diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc
index 57b9af159..e388f2450 100644
--- a/apt-pkg/cachefilter.cc
+++ b/apt-pkg/cachefilter.cc
@@ -9,10 +9,12 @@
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/macros.h>
 
 #include <string>
-
+#include <string.h>
 #include <regex.h>
 #include <fnmatch.h>
 
diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h
index 8e8776ed9..d9b957c67 100644
--- a/apt-pkg/cachefilter.h
+++ b/apt-pkg/cachefilter.h
@@ -7,6 +7,7 @@
 #define APT_CACHEFILTER_H
 // Include Files							/*{{{*/
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
 #include <string>
 
@@ -17,9 +18,12 @@ namespace CacheFilter {
 
 class PackageMatcher {
  public:
-   virtual bool operator() (pkgCache::PkgIterator const &Pkg) { return false; };
-   virtual bool operator() (pkgCache::GrpIterator const &Grp) { return false; };
-   virtual bool operator() (pkgCache::VerIterator const &Ver) { return false; };
+   virtual bool operator() (pkgCache::PkgIterator const &/*Pkg*/) { 
+      return false; };
+   virtual bool operator() (pkgCache::GrpIterator const &/*Grp*/) { 
+      return false; };
+   virtual bool operator() (pkgCache::VerIterator const &/*Ver*/) {
+      return false; };
    
    virtual ~PackageMatcher() {};
 };
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index ea6a4afba..2fdf8404d 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -29,7 +29,12 @@
 									/*}}}*/
 #ifndef PKGLIB_CACHEITERATORS_H
 #define PKGLIB_CACHEITERATORS_H
+#include<apt-pkg/pkgcache.h>
+#include<apt-pkg/macros.h>
+
 #include<iterator>
+#include <iosfwd>
+#include <string>
 
 #include<string.h>
 
@@ -55,36 +60,36 @@ template<typename Str, typename Itr> class pkgCache::Iterator :
 	public:
 	// Iteration
 	virtual void operator ++(int) = 0;
-	virtual void operator ++() = 0; // Should be {operator ++(0);};
-	inline bool end() const {return Owner == 0 || S == OwnerPointer();};
+	virtual void operator ++() = 0; // Should be {operator ++(0);}
+	inline bool end() const {return Owner == 0 || S == OwnerPointer();}
 
 	// Comparison
-	inline bool operator ==(const Itr &B) const {return S == B.S;};
-	inline bool operator !=(const Itr &B) const {return S != B.S;};
+	inline bool operator ==(const Itr &B) const {return S == B.S;}
+	inline bool operator !=(const Itr &B) const {return S != B.S;}
 
 	// Accessors
-	inline Str *operator ->() {return S;};
-	inline Str const *operator ->() const {return S;};
-	inline operator Str *() {return S == OwnerPointer() ? 0 : S;};
-	inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;};
-	inline Str &operator *() {return *S;};
-	inline Str const &operator *() const {return *S;};
-	inline pkgCache *Cache() const {return Owner;};
+	inline Str *operator ->() {return S;}
+	inline Str const *operator ->() const {return S;}
+	inline operator Str *() {return S == OwnerPointer() ? 0 : S;}
+	inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;}
+	inline Str &operator *() {return *S;}
+	inline Str const &operator *() const {return *S;}
+	inline pkgCache *Cache() const {return Owner;}
 
 	// Mixed stuff
-	inline void operator =(const Itr &B) {S = B.S; Owner = B.Owner;};
-	inline bool IsGood() const { return S && Owner && ! end();};
-	inline unsigned long Index() const {return S - OwnerPointer();};
+	inline void operator =(const Itr &B) {S = B.S; Owner = B.Owner;}
+	inline bool IsGood() const { return S && Owner && ! end();}
+	inline unsigned long Index() const {return S - OwnerPointer();}
 
 	void ReMap(void const * const oldMap, void const * const newMap) {
 		if (Owner == 0 || S == 0)
 			return;
-		S += (Str*)(newMap) - (Str*)(oldMap);
+		S += (Str const * const)(newMap) - (Str const * const)(oldMap);
 	}
 
 	// Constructors - look out for the variable assigning
-	inline Iterator() : S(0), Owner(0) {};
-	inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {};
+	inline Iterator() : S(0), Owner(0) {}
+	inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {}
 };
 									/*}}}*/
 // Group Iterator							/*{{{*/
@@ -98,19 +103,19 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
 	protected:
 	inline Group* OwnerPointer() const {
 		return (Owner != 0) ? Owner->GrpP : 0;
-	};
+	}
 
 	public:
 	// This constructor is the 'begin' constructor, never use it.
 	inline GrpIterator(pkgCache &Owner) : Iterator<Group, GrpIterator>(Owner), HashIndex(-1) {
 		S = OwnerPointer();
 		operator ++(0);
-	};
+	}
 
 	virtual void operator ++(int);
-	virtual void operator ++() {operator ++(0);};
+	virtual void operator ++() {operator ++(0);}
 
-	inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;};
+	inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}
 	inline PkgIterator PackageList() const;
 	PkgIterator FindPkg(std::string Arch = "any") const;
 	/** \brief find the package with the "best" architecture
@@ -127,8 +132,8 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
 	inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator<Group, GrpIterator>(Owner, Trg), HashIndex(0) {
 		if (S == 0)
 			S = OwnerPointer();
-	};
-	inline GrpIterator() : Iterator<Group, GrpIterator>(), HashIndex(0) {};
+	}
+	inline GrpIterator() : Iterator<Group, GrpIterator>(), HashIndex(0) {}
 
 };
 									/*}}}*/
@@ -139,35 +144,35 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
 	protected:
 	inline Package* OwnerPointer() const {
 		return (Owner != 0) ? Owner->PkgP : 0;
-	};
+	}
 
 	public:
 	// This constructor is the 'begin' constructor, never use it.
 	inline PkgIterator(pkgCache &Owner) : Iterator<Package, PkgIterator>(Owner), HashIndex(-1) {
 		S = OwnerPointer();
 		operator ++(0);
-	};
+	}
 
 	virtual void operator ++(int);
-	virtual void operator ++() {operator ++(0);};
+	virtual void operator ++() {operator ++(0);}
 
 	enum OkState {NeedsNothing,NeedsUnpack,NeedsConfigure};
 
 	// Accessors
-	inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;};
-	inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;};
+	inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}
+	inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}
 	inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge ||
-		(S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);};
-	inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;};
-	inline GrpIterator Group() const { return GrpIterator(*Owner, Owner->GrpP + S->Group);};
-
-	inline VerIterator VersionList() const;
-	inline VerIterator CurrentVer() const;
-	inline DepIterator RevDependsList() const;
-	inline PrvIterator ProvidesList() const;
-	OkState State() const;
-	const char *CandVersion() const;
-	const char *CurVersion() const;
+		(S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);}
+	inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}
+	inline APT_PURE GrpIterator Group() const { return GrpIterator(*Owner, Owner->GrpP + S->Group);}
+
+	inline VerIterator VersionList() const APT_PURE;
+	inline VerIterator CurrentVer() const APT_PURE;
+	inline DepIterator RevDependsList() const APT_PURE;
+	inline PrvIterator ProvidesList() const APT_PURE;
+	OkState State() const APT_PURE;
+	const char *CandVersion() const APT_PURE;
+	const char *CurVersion() const APT_PURE;
 
 	//Nice printable representation
 	friend std::ostream& operator <<(std::ostream& out, PkgIterator i);
@@ -177,8 +182,8 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
 	inline PkgIterator(pkgCache &Owner,Package *Trg) : Iterator<Package, PkgIterator>(Owner, Trg), HashIndex(0) {
 		if (S == 0)
 			S = OwnerPointer();
-	};
-	inline PkgIterator() : Iterator<Package, PkgIterator>(), HashIndex(0) {};
+	}
+	inline PkgIterator() : Iterator<Package, PkgIterator>(), HashIndex(0) {}
 };
 									/*}}}*/
 // Version Iterator							/*{{{*/
@@ -186,12 +191,12 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
 	protected:
 	inline Version* OwnerPointer() const {
 		return (Owner != 0) ? Owner->VerP : 0;
-	};
+	}
 
 	public:
 	// Iteration
-	void operator ++(int) {if (S != Owner->VerP) S = Owner->VerP + S->NextVer;};
-	inline void operator ++() {operator ++(0);};
+	void operator ++(int) {if (S != Owner->VerP) S = Owner->VerP + S->NextVer;}
+	inline void operator ++() {operator ++(0);}
 
 	// Comparison
 	int CompareVer(const VerIterator &B) const;
@@ -201,17 +206,17 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
 	    referring to the same "real" version */
 	inline bool SimilarVer(const VerIterator &B) const {
 		return (B.end() == false && S->Hash == B->Hash && strcmp(VerStr(), B.VerStr()) == 0);
-	};
+	}
 
 	// Accessors
-	inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;};
-	inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;};
+	inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}
+	inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}
 	inline const char *Arch() const {
 		if ((S->MultiArch & pkgCache::Version::All) == pkgCache::Version::All)
 			return "all";
 		return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
-	};
-	inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};
+	}
+	inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}
 
 	inline DescIterator DescriptionList() const;
 	DescIterator TranslatedDescription() const;
@@ -219,8 +224,8 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
 	inline PrvIterator ProvidesList() const;
 	inline VerFileIterator FileList() const;
 	bool Downloadable() const;
-	inline const char *PriorityType() const {return Owner->Priority(S->Priority);};
-	const char *MultiArchType() const;
+	inline const char *PriorityType() const {return Owner->Priority(S->Priority);}
+	const char *MultiArchType() const APT_PURE;
 	std::string RelStr() const;
 
 	bool Automatic() const;
@@ -229,8 +234,8 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
 	inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Version, VerIterator>(Owner, Trg) {
 		if (S == 0)
 			S = OwnerPointer();
-	};
-	inline VerIterator() : Iterator<Version, VerIterator>() {};
+	}
+	inline VerIterator() : Iterator<Version, VerIterator>() {}
 };
 									/*}}}*/
 // Description Iterator							/*{{{*/
@@ -238,26 +243,26 @@ class pkgCache::DescIterator : public Iterator<Description, DescIterator> {
 	protected:
 	inline Description* OwnerPointer() const {
 		return (Owner != 0) ? Owner->DescP : 0;
-	};
+	}
 
 	public:
 	// Iteration
-	void operator ++(int) {if (S != Owner->DescP) S = Owner->DescP + S->NextDesc;};
-	inline void operator ++() {operator ++(0);};
+	void operator ++(int) {if (S != Owner->DescP) S = Owner->DescP + S->NextDesc;}
+	inline void operator ++() {operator ++(0);}
 
 	// Comparison
 	int CompareDesc(const DescIterator &B) const;
 
 	// Accessors
-	inline const char *LanguageCode() const {return Owner->StrP + S->language_code;};
-	inline const char *md5() const {return Owner->StrP + S->md5sum;};
+	inline const char *LanguageCode() const {return Owner->StrP + S->language_code;}
+	inline const char *md5() const {return Owner->StrP + S->md5sum;}
 	inline DescFileIterator FileList() const;
 
-	inline DescIterator() : Iterator<Description, DescIterator>() {};
+	inline DescIterator() : Iterator<Description, DescIterator>() {}
 	inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Iterator<Description, DescIterator>(Owner, Trg) {
 		if (S == 0)
 			S = Owner.DescP;
-	};
+	}
 };
 									/*}}}*/
 // Dependency iterator							/*{{{*/
@@ -267,33 +272,33 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
 	protected:
 	inline Dependency* OwnerPointer() const {
 		return (Owner != 0) ? Owner->DepP : 0;
-	};
+	}
 
 	public:
 	// Iteration
 	void operator ++(int) {if (S != Owner->DepP) S = Owner->DepP +
-		(Type == DepVer ? S->NextDepends : S->NextRevDepends);};
-	inline void operator ++() {operator ++(0);};
+		(Type == DepVer ? S->NextDepends : S->NextRevDepends);}
+	inline void operator ++() {operator ++(0);}
 
 	// Accessors
-	inline const char *TargetVer() const {return S->Version == 0?0:Owner->StrP + S->Version;};
-	inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->Package);};
-	inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;};
-	inline VerIterator ParentVer() const {return VerIterator(*Owner,Owner->VerP + S->ParentVer);};
-	inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);};
-	inline bool Reverse() const {return Type == DepRev;};
-	bool IsCritical() const;
-	bool IsNegative() const;
-	bool IsIgnorable(PrvIterator const &Prv) const;
-	bool IsIgnorable(PkgIterator const &Pkg) const;
-	bool IsMultiArchImplicit() const;
-	bool IsSatisfied(VerIterator const &Ver) const;
-	bool IsSatisfied(PrvIterator const &Prv) const;
+	inline const char *TargetVer() const {return S->Version == 0?0:Owner->StrP + S->Version;}
+	inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->Package);}
+	inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}
+	inline VerIterator ParentVer() const {return VerIterator(*Owner,Owner->VerP + S->ParentVer);}
+	inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);}
+	inline bool Reverse() const {return Type == DepRev;}
+	bool IsCritical() const APT_PURE;
+	bool IsNegative() const APT_PURE;
+	bool IsIgnorable(PrvIterator const &Prv) const APT_PURE;
+	bool IsIgnorable(PkgIterator const &Pkg) const APT_PURE;
+	bool IsMultiArchImplicit() const APT_PURE;
+	bool IsSatisfied(VerIterator const &Ver) const APT_PURE;
+	bool IsSatisfied(PrvIterator const &Prv) const APT_PURE;
 	void GlobOr(DepIterator &Start,DepIterator &End);
 	Version **AllTargets() const;
 	bool SmartTargetPkg(PkgIterator &Result) const;
-	inline const char *CompType() const {return Owner->CompType(S->CompareOp);};
-	inline const char *DepType() const {return Owner->DepType(S->Type);};
+	inline const char *CompType() const {return Owner->CompType(S->CompareOp);}
+	inline const char *DepType() const {return Owner->DepType(S->Type);}
 
 	//Nice printable representation
 	friend std::ostream& operator <<(std::ostream& out, DepIterator D);
@@ -302,13 +307,13 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
 		Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepVer) {
 		if (S == 0)
 			S = Owner.DepP;
-	};
+	}
 	inline DepIterator(pkgCache &Owner, Dependency *Trg, Package*) :
 		Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepRev) {
 		if (S == 0)
 			S = Owner.DepP;
-	};
-	inline DepIterator() : Iterator<Dependency, DepIterator>(), Type(DepVer) {};
+	}
+	inline DepIterator() : Iterator<Dependency, DepIterator>(), Type(DepVer) {}
 };
 									/*}}}*/
 // Provides iterator							/*{{{*/
@@ -318,34 +323,34 @@ class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> {
 	protected:
 	inline Provides* OwnerPointer() const {
 		return (Owner != 0) ? Owner->ProvideP : 0;
-	};
+	}
 
 	public:
 	// Iteration
 	void operator ++(int) {if (S != Owner->ProvideP) S = Owner->ProvideP +
-		(Type == PrvVer?S->NextPkgProv:S->NextProvides);};
-	inline void operator ++() {operator ++(0);};
+		(Type == PrvVer?S->NextPkgProv:S->NextProvides);}
+	inline void operator ++() {operator ++(0);}
 
 	// Accessors
-	inline const char *Name() const {return Owner->StrP + Owner->PkgP[S->ParentPkg].Name;};
-	inline const char *ProvideVersion() const {return S->ProvideVersion == 0?0:Owner->StrP + S->ProvideVersion;};
-	inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};
-	inline VerIterator OwnerVer() const {return VerIterator(*Owner,Owner->VerP + S->Version);};
-	inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);};
+	inline const char *Name() const {return Owner->StrP + Owner->PkgP[S->ParentPkg].Name;}
+	inline const char *ProvideVersion() const {return S->ProvideVersion == 0?0:Owner->StrP + S->ProvideVersion;}
+	inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}
+	inline VerIterator OwnerVer() const {return VerIterator(*Owner,Owner->VerP + S->Version);}
+	inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);}
 
-	bool IsMultiArchImplicit() const;
+	bool IsMultiArchImplicit() const APT_PURE;
 
-	inline PrvIterator() : Iterator<Provides, PrvIterator>(), Type(PrvVer) {};
+	inline PrvIterator() : Iterator<Provides, PrvIterator>(), Type(PrvVer) {}
 	inline PrvIterator(pkgCache &Owner, Provides *Trg, Version*) :
 		Iterator<Provides, PrvIterator>(Owner, Trg), Type(PrvVer) {
 		if (S == 0)
 			S = Owner.ProvideP;
-	};
+	}
 	inline PrvIterator(pkgCache &Owner, Provides *Trg, Package*) :
 		Iterator<Provides, PrvIterator>(Owner, Trg), Type(PrvPkg) {
 		if (S == 0)
 			S = Owner.ProvideP;
-	};
+	}
 };
 									/*}}}*/
 // Package file								/*{{{*/
@@ -353,32 +358,32 @@ class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator>
 	protected:
 	inline PackageFile* OwnerPointer() const {
 		return (Owner != 0) ? Owner->PkgFileP : 0;
-	};
+	}
 
 	public:
 	// Iteration
-	void operator ++(int) {if (S != Owner->PkgFileP) S = Owner->PkgFileP + S->NextFile;};
-	inline void operator ++() {operator ++(0);};
+	void operator ++(int) {if (S != Owner->PkgFileP) S = Owner->PkgFileP + S->NextFile;}
+	inline void operator ++() {operator ++(0);}
 
 	// Accessors
-	inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;};
-	inline const char *Archive() const {return S->Archive == 0?0:Owner->StrP + S->Archive;};
-	inline const char *Component() const {return S->Component == 0?0:Owner->StrP + S->Component;};
-	inline const char *Version() const {return S->Version == 0?0:Owner->StrP + S->Version;};
-	inline const char *Origin() const {return S->Origin == 0?0:Owner->StrP + S->Origin;};
-	inline const char *Codename() const {return S->Codename ==0?0:Owner->StrP + S->Codename;};
-	inline const char *Label() const {return S->Label == 0?0:Owner->StrP + S->Label;};
-	inline const char *Site() const {return S->Site == 0?0:Owner->StrP + S->Site;};
-	inline const char *Architecture() const {return S->Architecture == 0?0:Owner->StrP + S->Architecture;};
-	inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;};
+	inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;}
+	inline const char *Archive() const {return S->Archive == 0?0:Owner->StrP + S->Archive;}
+	inline const char *Component() const {return S->Component == 0?0:Owner->StrP + S->Component;}
+	inline const char *Version() const {return S->Version == 0?0:Owner->StrP + S->Version;}
+	inline const char *Origin() const {return S->Origin == 0?0:Owner->StrP + S->Origin;}
+	inline const char *Codename() const {return S->Codename ==0?0:Owner->StrP + S->Codename;}
+	inline const char *Label() const {return S->Label == 0?0:Owner->StrP + S->Label;}
+	inline const char *Site() const {return S->Site == 0?0:Owner->StrP + S->Site;}
+	inline const char *Architecture() const {return S->Architecture == 0?0:Owner->StrP + S->Architecture;}
+	inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;}
 
 	bool IsOk();
 	std::string RelStr();
 
 	// Constructors
-	inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {};
-	inline PkgFileIterator(pkgCache &Owner) : Iterator<PackageFile, PkgFileIterator>(Owner, Owner.PkgFileP) {};
-	inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Iterator<PackageFile, PkgFileIterator>(Owner, Trg) {};
+	inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {}
+	inline PkgFileIterator(pkgCache &Owner) : Iterator<PackageFile, PkgFileIterator>(Owner, Owner.PkgFileP) {}
+	inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Iterator<PackageFile, PkgFileIterator>(Owner, Trg) {}
 };
 									/*}}}*/
 // Version File								/*{{{*/
@@ -386,18 +391,18 @@ class pkgCache::VerFileIterator : public pkgCache::Iterator<VerFile, VerFileIter
 	protected:
 	inline VerFile* OwnerPointer() const {
 		return (Owner != 0) ? Owner->VerFileP : 0;
-	};
+	}
 
 	public:
 	// Iteration
-	void operator ++(int) {if (S != Owner->VerFileP) S = Owner->VerFileP + S->NextFile;};
-	inline void operator ++() {operator ++(0);};
+	void operator ++(int) {if (S != Owner->VerFileP) S = Owner->VerFileP + S->NextFile;}
+	inline void operator ++() {operator ++(0);}
 
 	// Accessors
-	inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);};
+	inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}
 
-	inline VerFileIterator() : Iterator<VerFile, VerFileIterator>() {};
-	inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Iterator<VerFile, VerFileIterator>(Owner, Trg) {};
+	inline VerFileIterator() : Iterator<VerFile, VerFileIterator>() {}
+	inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Iterator<VerFile, VerFileIterator>(Owner, Trg) {}
 };
 									/*}}}*/
 // Description File							/*{{{*/
@@ -405,40 +410,40 @@ class pkgCache::DescFileIterator : public Iterator<DescFile, DescFileIterator> {
 	protected:
 	inline DescFile* OwnerPointer() const {
 		return (Owner != 0) ? Owner->DescFileP : 0;
-	};
+	}
 
 	public:
 	// Iteration
-	void operator ++(int) {if (S != Owner->DescFileP) S = Owner->DescFileP + S->NextFile;};
-	inline void operator ++() {operator ++(0);};
+	void operator ++(int) {if (S != Owner->DescFileP) S = Owner->DescFileP + S->NextFile;}
+	inline void operator ++() {operator ++(0);}
 
 	// Accessors
-	inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);};
+	inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}
 
-	inline DescFileIterator() : Iterator<DescFile, DescFileIterator>() {};
-	inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Iterator<DescFile, DescFileIterator>(Owner, Trg) {};
+	inline DescFileIterator() : Iterator<DescFile, DescFileIterator>() {}
+	inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Iterator<DescFile, DescFileIterator>(Owner, Trg) {}
 };
 									/*}}}*/
 // Inlined Begin functions can't be in the class because of order problems /*{{{*/
 inline pkgCache::PkgIterator pkgCache::GrpIterator::PackageList() const
-       {return PkgIterator(*Owner,Owner->PkgP + S->FirstPackage);};
+       {return PkgIterator(*Owner,Owner->PkgP + S->FirstPackage);}
 inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const
-       {return VerIterator(*Owner,Owner->VerP + S->VersionList);};
+       {return VerIterator(*Owner,Owner->VerP + S->VersionList);}
 inline pkgCache::VerIterator pkgCache::PkgIterator::CurrentVer() const
-       {return VerIterator(*Owner,Owner->VerP + S->CurrentVer);};
+       {return VerIterator(*Owner,Owner->VerP + S->CurrentVer);}
 inline pkgCache::DepIterator pkgCache::PkgIterator::RevDependsList() const
-       {return DepIterator(*Owner,Owner->DepP + S->RevDepends,S);};
+       {return DepIterator(*Owner,Owner->DepP + S->RevDepends,S);}
 inline pkgCache::PrvIterator pkgCache::PkgIterator::ProvidesList() const
-       {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);};
+       {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);}
 inline pkgCache::DescIterator pkgCache::VerIterator::DescriptionList() const
-       {return DescIterator(*Owner,Owner->DescP + S->DescriptionList);};
+       {return DescIterator(*Owner,Owner->DescP + S->DescriptionList);}
 inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const
-       {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);};
+       {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);}
 inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const
-       {return DepIterator(*Owner,Owner->DepP + S->DependsList,S);};
+       {return DepIterator(*Owner,Owner->DepP + S->DependsList,S);}
 inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const
-       {return VerFileIterator(*Owner,Owner->VerFileP + S->FileList);};
+       {return VerFileIterator(*Owner,Owner->VerFileP + S->FileList);}
 inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const
-       {return DescFileIterator(*Owner,Owner->DescFileP + S->FileList);};
+       {return DescFileIterator(*Owner,Owner->DescFileP + S->FileList);}
 									/*}}}*/
 #endif
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index 6b6fdb5ad..2ed6a96da 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -16,14 +16,22 @@
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/strutl.h>
 #include <apt-pkg/versionmatch.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/policy.h>
-
-#include <vector>
-
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
+
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 #include <regex.h>
+#include <list>
+#include <string>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -383,6 +391,8 @@ bool VersionContainerInterface::FromModifierCommandLine(unsigned short &modID,
 							CacheSetHelper &helper) {
 	Version select = NEWEST;
 	std::string str = cmdline;
+	if (unlikely(str.empty() == true))
+		return false;
 	bool modifierPresent = false;
 	unsigned short fallback = modID;
 	for (std::list<Modifier>::const_iterator mod = mods.begin();
@@ -392,8 +402,8 @@ bool VersionContainerInterface::FromModifierCommandLine(unsigned short &modID,
 		size_t const alength = strlen(mod->Alias);
 		switch(mod->Pos) {
 		case Modifier::POSTFIX:
-			if (str.compare(str.length() - alength, alength,
-					mod->Alias, 0, alength) != 0)
+			if (str.length() <= alength ||
+			      str.compare(str.length() - alength, alength, mod->Alias, 0, alength) != 0)
 				continue;
 			str.erase(str.length() - alength);
 			modID = mod->ID;
@@ -588,13 +598,13 @@ pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache,
 }
 									/*}}}*/
 // canNotFindTask - handle the case no package is found for a task	/*{{{*/
-void CacheSetHelper::canNotFindTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern) {
+void CacheSetHelper::canNotFindTask(PackageContainerInterface * const /*pci*/, pkgCacheFile &/*Cache*/, std::string pattern) {
 	if (ShowError == true)
 		_error->Insert(ErrorType, _("Couldn't find task '%s'"), pattern.c_str());
 }
 									/*}}}*/
 // canNotFindRegEx - handle the case no package is found by a regex	/*{{{*/
-void CacheSetHelper::canNotFindRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern) {
+void CacheSetHelper::canNotFindRegEx(PackageContainerInterface * const /*pci*/, pkgCacheFile &/*Cache*/, std::string pattern) {
 	if (ShowError == true)
 		_error->Insert(ErrorType, _("Couldn't find any package by regex '%s'"), pattern.c_str());
 }
@@ -606,25 +616,25 @@ void CacheSetHelper::canNotFindFnmatch(PackageContainerInterface * const pci, pk
 }
 #endif									/*}}}*/
 // canNotFindPackage - handle the case no package is found from a string/*{{{*/
-void CacheSetHelper::canNotFindPackage(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str) {
+APT_CONST void CacheSetHelper::canNotFindPackage(PackageContainerInterface * const /*pci*/, pkgCacheFile &/*Cache*/, std::string const &/*str*/) {
 }
 									/*}}}*/
 // canNotFindAllVer							/*{{{*/
-void CacheSetHelper::canNotFindAllVer(VersionContainerInterface * const vci, pkgCacheFile &Cache,
+void CacheSetHelper::canNotFindAllVer(VersionContainerInterface * const /*vci*/, pkgCacheFile &/*Cache*/,
 		pkgCache::PkgIterator const &Pkg) {
 	if (ShowError == true)
 		_error->Insert(ErrorType, _("Can't select versions from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str());
 }
 									/*}}}*/
 // canNotFindInstCandVer						/*{{{*/
-void CacheSetHelper::canNotFindInstCandVer(VersionContainerInterface * const vci, pkgCacheFile &Cache,
+void CacheSetHelper::canNotFindInstCandVer(VersionContainerInterface * const /*vci*/, pkgCacheFile &/*Cache*/,
 		pkgCache::PkgIterator const &Pkg) {
 	if (ShowError == true)
 		_error->Insert(ErrorType, _("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str());
 }
 									/*}}}*/
 // canNotFindInstCandVer						/*{{{*/
-void CacheSetHelper::canNotFindCandInstVer(VersionContainerInterface * const vci, pkgCacheFile &Cache,
+void CacheSetHelper::canNotFindCandInstVer(VersionContainerInterface * const /*vci*/, pkgCacheFile &/*Cache*/,
 		pkgCache::PkgIterator const &Pkg) {
 	if (ShowError == true)
 		_error->Insert(ErrorType, _("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str());
@@ -655,27 +665,27 @@ pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache
 }
 									/*}}}*/
 // showTaskSelection							/*{{{*/
-void CacheSetHelper::showTaskSelection(pkgCache::PkgIterator const &pkg,
-				       std::string const &pattern) {
+APT_CONST void CacheSetHelper::showTaskSelection(pkgCache::PkgIterator const &/*pkg*/,
+				       std::string const &/*pattern*/) {
 }
 									/*}}}*/
 // showRegExSelection							/*{{{*/
-void CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const &pkg,
-					std::string const &pattern) {
+APT_CONST void CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const &/*pkg*/,
+					std::string const &/*pattern*/) {
 }
 									/*}}}*/
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
 // showFnmatchSelection							/*{{{*/
-void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const &pkg,
+APT_CONST void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const &pkg,
                                           std::string const &pattern) {
 }
 									/*}}}*/
 #endif
 // showSelectedVersion							/*{{{*/
-void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &Pkg,
-					 pkgCache::VerIterator const Ver,
-					 std::string const &ver,
-					 bool const verIsRel) {
+APT_CONST void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &/*Pkg*/,
+					 pkgCache::VerIterator const /*Ver*/,
+					 std::string const &/*ver*/,
+					 bool const /*verIsRel*/) {
 }
 									/*}}}*/
 }
diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index b69d74b8e..16a3daa42 100644
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -9,7 +9,6 @@
 #ifndef APT_CACHESET_H
 #define APT_CACHESET_H
 // Include Files							/*{{{*/
-#include <iostream>
 #include <fstream>
 #include <map>
 #include <set>
@@ -17,12 +16,18 @@
 #include <string>
 #include <iterator>
 
+#include <stddef.h>
+
 #include <apt-pkg/error.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/cachefile.h>
 #endif
+#ifndef APT_10_CLEANER_HEADERS
+#include <iostream>
+#endif
 									/*}}}*/
 
 class pkgCacheFile;
@@ -43,8 +48,8 @@ class CacheSetHelper {							/*{{{*/
 public:									/*{{{*/
 	CacheSetHelper(bool const ShowError = true,
 		GlobalError::MsgType ErrorType = GlobalError::ERROR) :
-			ShowError(ShowError), ErrorType(ErrorType) {};
-	virtual ~CacheSetHelper() {};
+			ShowError(ShowError), ErrorType(ErrorType) {}
+	virtual ~CacheSetHelper() {}
 
 	virtual void showTaskSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern);
 	virtual void showRegExSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern);
@@ -76,9 +81,9 @@ public:									/*{{{*/
 	virtual pkgCache::VerIterator canNotFindInstalledVer(pkgCacheFile &Cache,
 				pkgCache::PkgIterator const &Pkg);
 
-	bool showErrors() const { return ShowError; };
-	bool showErrors(bool const newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); };
-	GlobalError::MsgType errorType() const { return ErrorType; };
+	bool showErrors() const { return ShowError; }
+	bool showErrors(bool const newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); }
+	GlobalError::MsgType errorType() const { return ErrorType; }
 	GlobalError::MsgType errorType(GlobalError::MsgType const &newValue)
 	{
 		if (ErrorType == newValue) return ErrorType;
@@ -87,7 +92,7 @@ public:									/*{{{*/
 			ErrorType = newValue;
 			return oldValue;
 		}
-	};
+	}
 
 									/*}}}*/
 protected:
@@ -124,12 +129,12 @@ public:
 		inline pkgCache::PkgIterator::OkState State() const { return getPkg().State(); }
 		inline const char *CandVersion() const { return getPkg().CandVersion(); }
 		inline const char *CurVersion() const { return getPkg().CurVersion(); }
-		inline pkgCache *Cache() const { return getPkg().Cache(); };
-		inline unsigned long Index() const {return getPkg().Index();};
+		inline pkgCache *Cache() const { return getPkg().Cache(); }
+		inline unsigned long Index() const {return getPkg().Index();}
 		// we have only valid iterators here
-		inline bool end() const { return false; };
+		inline bool end() const { return false; }
 
-		inline pkgCache::Package const * operator->() const {return &*getPkg();};
+		inline pkgCache::Package const * operator->() const {return &*getPkg();}
 	};
 									/*}}}*/
 
@@ -154,7 +159,7 @@ public:
 		unsigned short ID;
 		const char * const Alias;
 		Position Pos;
-		Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {};
+		Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}
 	};
 
 	static bool FromModifierCommandLine(unsigned short &modID, PackageContainerInterface * const pci,
@@ -177,12 +182,12 @@ public:									/*{{{*/
 	public:
 		const_iterator(typename Container::const_iterator i) : _iter(i) {}
 		pkgCache::PkgIterator getPkg(void) const { return *_iter; }
-		inline pkgCache::PkgIterator operator*(void) const { return *_iter; };
+		inline pkgCache::PkgIterator operator*(void) const { return *_iter; }
 		operator typename Container::const_iterator(void) const { return _iter; }
 		inline const_iterator& operator++() { ++_iter; return *this; }
 		inline const_iterator operator++(int) { const_iterator tmp(*this); operator++(); return tmp; }
-		inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; };
-		inline bool operator==(const_iterator const &i) const { return _iter == i._iter; };
+		inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; }
+		inline bool operator==(const_iterator const &i) const { return _iter == i._iter; }
 		friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, *i); }
 	};
 	class iterator : public PackageContainerInterface::const_iterator,
@@ -191,43 +196,43 @@ public:									/*{{{*/
 	public:
 		iterator(typename Container::iterator i) : _iter(i) {}
 		pkgCache::PkgIterator getPkg(void) const { return *_iter; }
-		inline pkgCache::PkgIterator operator*(void) const { return *_iter; };
+		inline pkgCache::PkgIterator operator*(void) const { return *_iter; }
 		operator typename Container::iterator(void) const { return _iter; }
 		operator typename PackageContainer<Container>::const_iterator() { return typename PackageContainer<Container>::const_iterator(_iter); }
 		inline iterator& operator++() { ++_iter; return *this; }
 		inline iterator operator++(int) { iterator tmp(*this); operator++(); return tmp; }
-		inline bool operator!=(iterator const &i) const { return _iter != i._iter; };
-		inline bool operator==(iterator const &i) const { return _iter == i._iter; };
-		inline iterator& operator=(iterator const &i) { _iter = i._iter; return *this; };
-		inline iterator& operator=(typename Container::iterator const &i) { _iter = i; return *this; };
+		inline bool operator!=(iterator const &i) const { return _iter != i._iter; }
+		inline bool operator==(iterator const &i) const { return _iter == i._iter; }
+		inline iterator& operator=(iterator const &i) { _iter = i._iter; return *this; }
+		inline iterator& operator=(typename Container::iterator const &i) { _iter = i; return *this; }
 		friend std::ostream& operator<<(std::ostream& out, iterator i) { return operator<<(out, *i); }
 	};
 									/*}}}*/
 
-	bool insert(pkgCache::PkgIterator const &P) { if (P.end() == true) return false; _cont.insert(P); return true; };
-	template<class Cont> void insert(PackageContainer<Cont> const &pkgcont) { _cont.insert((typename Cont::const_iterator)pkgcont.begin(), (typename Cont::const_iterator)pkgcont.end()); };
-	void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); };
+	bool insert(pkgCache::PkgIterator const &P) { if (P.end() == true) return false; _cont.insert(P); return true; }
+	template<class Cont> void insert(PackageContainer<Cont> const &pkgcont) { _cont.insert((typename Cont::const_iterator)pkgcont.begin(), (typename Cont::const_iterator)pkgcont.end()); }
+	void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); }
 
-	bool empty() const { return _cont.empty(); };
-	void clear() { return _cont.clear(); };
+	bool empty() const { return _cont.empty(); }
+	void clear() { return _cont.clear(); }
 	//FIXME: on ABI break, replace the first with the second without bool
-	void erase(iterator position) { _cont.erase((typename Container::iterator)position); };
-	iterator& erase(iterator &position, bool) { return position = _cont.erase((typename Container::iterator)position); };
-	size_t erase(const pkgCache::PkgIterator x) { return _cont.erase(x); };
-	void erase(iterator first, iterator last) { _cont.erase(first, last); };
-	size_t size() const { return _cont.size(); };
+	void erase(iterator position) { _cont.erase((typename Container::iterator)position); }
+	iterator& erase(iterator &position, bool) { return position = _cont.erase((typename Container::iterator)position); }
+	size_t erase(const pkgCache::PkgIterator x) { return _cont.erase(x); }
+	void erase(iterator first, iterator last) { _cont.erase(first, last); }
+	size_t size() const { return _cont.size(); }
 
-	const_iterator begin() const { return const_iterator(_cont.begin()); };
-	const_iterator end() const { return const_iterator(_cont.end()); };
-	iterator begin() { return iterator(_cont.begin()); };
-	iterator end() { return iterator(_cont.end()); };
-	const_iterator find(pkgCache::PkgIterator const &P) const { return const_iterator(_cont.find(P)); };
+	const_iterator begin() const { return const_iterator(_cont.begin()); }
+	const_iterator end() const { return const_iterator(_cont.end()); }
+	iterator begin() { return iterator(_cont.begin()); }
+	iterator end() { return iterator(_cont.end()); }
+	const_iterator find(pkgCache::PkgIterator const &P) const { return const_iterator(_cont.find(P)); }
 
-	void setConstructor(Constructor const &by) { ConstructedBy = by; };
-	Constructor getConstructor() const { return ConstructedBy; };
+	void setConstructor(Constructor const &by) { ConstructedBy = by; }
+	Constructor getConstructor() const { return ConstructedBy; }
 
-	PackageContainer() : ConstructedBy(UNKNOWN) {};
-	PackageContainer(Constructor const &by) : ConstructedBy(by) {};
+	PackageContainer() : ConstructedBy(UNKNOWN) {}
+	PackageContainer(Constructor const &by) : ConstructedBy(by) {}
 
 	/** \brief returns all packages in the cache who belong to the given task
 
@@ -365,7 +370,7 @@ private:								/*{{{*/
 template<> template<class Cont> void PackageContainer<std::list<pkgCache::PkgIterator> >::insert(PackageContainer<Cont> const &pkgcont) {
 	for (typename PackageContainer<Cont>::const_iterator p = pkgcont.begin(); p != pkgcont.end(); ++p)
 		_cont.push_back(*p);
-};
+}
 // these two are 'inline' as otherwise the linker has problems with seeing these untemplated
 // specializations again and again - but we need to see them, so that library users can use them
 template<> inline bool PackageContainer<std::list<pkgCache::PkgIterator> >::insert(pkgCache::PkgIterator const &P) {
@@ -373,11 +378,11 @@ template<> inline bool PackageContainer<std::list<pkgCache::PkgIterator> >::inse
 		return false;
 	_cont.push_back(P);
 	return true;
-};
+}
 template<> inline void PackageContainer<std::list<pkgCache::PkgIterator> >::insert(const_iterator begin, const_iterator end) {
 	for (const_iterator p = begin; p != end; ++p)
 		_cont.push_back(*p);
-};
+}
 typedef PackageContainer<std::set<pkgCache::PkgIterator> > PackageSet;
 typedef PackageContainer<std::list<pkgCache::PkgIterator> > PackageList;
 
@@ -392,27 +397,27 @@ public:
 		virtual pkgCache::VerIterator getVer() const = 0;
 		operator pkgCache::VerIterator(void) { return getVer(); }
 
-		inline pkgCache *Cache() const { return getVer().Cache(); };
-		inline unsigned long Index() const {return getVer().Index();};
-		inline int CompareVer(const pkgCache::VerIterator &B) const { return getVer().CompareVer(B); };
-		inline const char *VerStr() const { return getVer().VerStr(); };
-		inline const char *Section() const { return getVer().Section(); };
-		inline const char *Arch() const { return getVer().Arch(); };
-		inline pkgCache::PkgIterator ParentPkg() const { return getVer().ParentPkg(); };
-		inline pkgCache::DescIterator DescriptionList() const { return getVer().DescriptionList(); };
-		inline pkgCache::DescIterator TranslatedDescription() const { return getVer().TranslatedDescription(); };
-		inline pkgCache::DepIterator DependsList() const { return getVer().DependsList(); };
-		inline pkgCache::PrvIterator ProvidesList() const { return getVer().ProvidesList(); };
-		inline pkgCache::VerFileIterator FileList() const { return getVer().FileList(); };
-		inline bool Downloadable() const { return getVer().Downloadable(); };
-		inline const char *PriorityType() const { return getVer().PriorityType(); };
-		inline std::string RelStr() const { return getVer().RelStr(); };
-		inline bool Automatic() const { return getVer().Automatic(); };
-		inline pkgCache::VerFileIterator NewestFile() const { return getVer().NewestFile(); };
+		inline pkgCache *Cache() const { return getVer().Cache(); }
+		inline unsigned long Index() const {return getVer().Index();}
+		inline int CompareVer(const pkgCache::VerIterator &B) const { return getVer().CompareVer(B); }
+		inline const char *VerStr() const { return getVer().VerStr(); }
+		inline const char *Section() const { return getVer().Section(); }
+		inline const char *Arch() const { return getVer().Arch(); }
+		inline pkgCache::PkgIterator ParentPkg() const { return getVer().ParentPkg(); }
+		inline pkgCache::DescIterator DescriptionList() const { return getVer().DescriptionList(); }
+		inline pkgCache::DescIterator TranslatedDescription() const { return getVer().TranslatedDescription(); }
+		inline pkgCache::DepIterator DependsList() const { return getVer().DependsList(); }
+		inline pkgCache::PrvIterator ProvidesList() const { return getVer().ProvidesList(); }
+		inline pkgCache::VerFileIterator FileList() const { return getVer().FileList(); }
+		inline bool Downloadable() const { return getVer().Downloadable(); }
+		inline const char *PriorityType() const { return getVer().PriorityType(); }
+		inline std::string RelStr() const { return getVer().RelStr(); }
+		inline bool Automatic() const { return getVer().Automatic(); }
+		inline pkgCache::VerFileIterator NewestFile() const { return getVer().NewestFile(); }
 		// we have only valid iterators here
-		inline bool end() const { return false; };
+		inline bool end() const { return false; }
 
-		inline pkgCache::Version const * operator->() const { return &*getVer(); };
+		inline pkgCache::Version const * operator->() const { return &*getVer(); }
 	};
 									/*}}}*/
 
@@ -446,7 +451,7 @@ public:
 		Version SelectVersion;
 		Modifier (unsigned short const &id, const char * const alias, Position const &pos,
 			  Version const &select) : ID(id), Alias(alias), Pos(pos),
-			 SelectVersion(select) {};
+			 SelectVersion(select) {}
 	};
 
 	static bool FromCommandLine(VersionContainerInterface * const vci, pkgCacheFile &Cache,
@@ -479,14 +484,16 @@ protected:								/*{{{*/
 	/** \brief returns the candidate version of the package
 
 	    \param Cache to be used to query for information
-	    \param Pkg we want the candidate version from this package */
+	    \param Pkg we want the candidate version from this package
+	    \param helper used in this container instance */
 	static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache,
 		pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper);
 
 	/** \brief returns the installed version of the package
 
 	    \param Cache to be used to query for information
-	    \param Pkg we want the installed version from this package */
+	    \param Pkg we want the installed version from this package
+	    \param helper used in this container instance */
 	static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache,
 		pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper);
 									/*}}}*/
@@ -507,12 +514,12 @@ public:									/*{{{*/
 	public:
 		const_iterator(typename Container::const_iterator i) : _iter(i) {}
 		pkgCache::VerIterator getVer(void) const { return *_iter; }
-		inline pkgCache::VerIterator operator*(void) const { return *_iter; };
+		inline pkgCache::VerIterator operator*(void) const { return *_iter; }
 		operator typename Container::const_iterator(void) const { return _iter; }
 		inline const_iterator& operator++() { ++_iter; return *this; }
 		inline const_iterator operator++(int) { const_iterator tmp(*this); operator++(); return tmp; }
-		inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; };
-		inline bool operator==(const_iterator const &i) const { return _iter == i._iter; };
+		inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; }
+		inline bool operator==(const_iterator const &i) const { return _iter == i._iter; }
 		friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, *i); }
 	};
 	class iterator : public VersionContainerInterface::const_iterator,
@@ -521,36 +528,36 @@ public:									/*{{{*/
 	public:
 		iterator(typename Container::iterator i) : _iter(i) {}
 		pkgCache::VerIterator getVer(void) const { return *_iter; }
-		inline pkgCache::VerIterator operator*(void) const { return *_iter; };
+		inline pkgCache::VerIterator operator*(void) const { return *_iter; }
 		operator typename Container::iterator(void) const { return _iter; }
 		operator typename VersionContainer<Container>::const_iterator() { return typename VersionContainer<Container>::const_iterator(_iter); }
 		inline iterator& operator++() { ++_iter; return *this; }
 		inline iterator operator++(int) { iterator tmp(*this); operator++(); return tmp; }
-		inline bool operator!=(iterator const &i) const { return _iter != i._iter; };
-		inline bool operator==(iterator const &i) const { return _iter == i._iter; };
-		inline iterator& operator=(iterator const &i) { _iter = i._iter; return *this; };
-		inline iterator& operator=(typename Container::iterator const &i) { _iter = i; return *this; };
+		inline bool operator!=(iterator const &i) const { return _iter != i._iter; }
+		inline bool operator==(iterator const &i) const { return _iter == i._iter; }
+		inline iterator& operator=(iterator const &i) { _iter = i._iter; return *this; }
+		inline iterator& operator=(typename Container::iterator const &i) { _iter = i; return *this; }
 		friend std::ostream& operator<<(std::ostream& out, iterator i) { return operator<<(out, *i); }
 	};
 									/*}}}*/
 
-	bool insert(pkgCache::VerIterator const &V) { if (V.end() == true) return false; _cont.insert(V); return true; };
-	template<class Cont> void insert(VersionContainer<Cont> const &vercont) { _cont.insert((typename Cont::const_iterator)vercont.begin(), (typename Cont::const_iterator)vercont.end()); };
-	void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); };
-	bool empty() const { return _cont.empty(); };
-	void clear() { return _cont.clear(); };
+	bool insert(pkgCache::VerIterator const &V) { if (V.end() == true) return false; _cont.insert(V); return true; }
+	template<class Cont> void insert(VersionContainer<Cont> const &vercont) { _cont.insert((typename Cont::const_iterator)vercont.begin(), (typename Cont::const_iterator)vercont.end()); }
+	void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); }
+	bool empty() const { return _cont.empty(); }
+	void clear() { return _cont.clear(); }
 	//FIXME: on ABI break, replace the first with the second without bool
-	void erase(iterator position) { _cont.erase((typename Container::iterator)position); };
-	iterator& erase(iterator &position, bool) { return position = _cont.erase((typename Container::iterator)position); };
-	size_t erase(const pkgCache::VerIterator x) { return _cont.erase(x); };
-	void erase(iterator first, iterator last) { _cont.erase(first, last); };
-	size_t size() const { return _cont.size(); };
-
-	const_iterator begin() const { return const_iterator(_cont.begin()); };
-	const_iterator end() const { return const_iterator(_cont.end()); };
-	iterator begin() { return iterator(_cont.begin()); };
-	iterator end() { return iterator(_cont.end()); };
-	const_iterator find(pkgCache::VerIterator const &V) const { return const_iterator(_cont.find(V)); };
+	void erase(iterator position) { _cont.erase((typename Container::iterator)position); }
+	iterator& erase(iterator &position, bool) { return position = _cont.erase((typename Container::iterator)position); }
+	size_t erase(const pkgCache::VerIterator x) { return _cont.erase(x); }
+	void erase(iterator first, iterator last) { _cont.erase(first, last); }
+	size_t size() const { return _cont.size(); }
+
+	const_iterator begin() const { return const_iterator(_cont.begin()); }
+	const_iterator end() const { return const_iterator(_cont.end()); }
+	iterator begin() { return iterator(_cont.begin()); }
+	iterator end() { return iterator(_cont.end()); }
+	const_iterator find(pkgCache::VerIterator const &V) const { return const_iterator(_cont.find(V)); }
 
 	/** \brief returns all versions specified on the commandline
 
@@ -558,6 +565,7 @@ public:									/*{{{*/
 	    non specifically requested  and executes regex's if needed on names.
 	    \param Cache the packages and versions are in
 	    \param cmdline Command line the versions should be extracted from
+	    \param fallback version specification
 	    \param helper responsible for error and message handling */
 	static VersionContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline,
 			Version const &fallback, CacheSetHelper &helper) {
@@ -656,7 +664,7 @@ public:									/*{{{*/
 template<> template<class Cont> void VersionContainer<std::list<pkgCache::VerIterator> >::insert(VersionContainer<Cont> const &vercont) {
 	for (typename VersionContainer<Cont>::const_iterator v = vercont.begin(); v != vercont.end(); ++v)
 		_cont.push_back(*v);
-};
+}
 // these two are 'inline' as otherwise the linker has problems with seeing these untemplated
 // specializations again and again - but we need to see them, so that library users can use them
 template<> inline bool VersionContainer<std::list<pkgCache::VerIterator> >::insert(pkgCache::VerIterator const &V) {
@@ -664,11 +672,11 @@ template<> inline bool VersionContainer<std::list<pkgCache::VerIterator> >::inse
 		return false;
 	_cont.push_back(V);
 	return true;
-};
+}
 template<> inline void VersionContainer<std::list<pkgCache::VerIterator> >::insert(const_iterator begin, const_iterator end) {
 	for (const_iterator v = begin; v != end; ++v)
 		_cont.push_back(*v);
-};
+}
 typedef VersionContainer<std::set<pkgCache::VerIterator> > VersionSet;
 typedef VersionContainer<std::list<pkgCache::VerIterator> > VersionList;
 }
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 3ae1e8b1d..a5ad6a9ff 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -1,28 +1,30 @@
 /*
  */
-#include<config.h>
-
-#include<apt-pkg/init.h>
-#include<apt-pkg/error.h>
-#include<apt-pkg/cdromutl.h>
-#include<apt-pkg/strutl.h>
-#include<apt-pkg/cdrom.h>
-#include<apt-pkg/aptconfiguration.h>
-#include<apt-pkg/configuration.h>
-#include<apt-pkg/fileutl.h>
-
-#include<sstream>
-#include<fstream>
+#include <config.h>
+
+#include <apt-pkg/error.h>
+#include <apt-pkg/cdromutl.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/cdrom.h>
+#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/indexcopy.h>
+
+
+#include <string.h>
+#include <iostream>
+#include <string>
+#include <vector>
+#include <sstream>
+#include <fstream>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <algorithm>
 #include <dlfcn.h>
 
-#include "indexcopy.h"
-
 #include<apti18n.h>
 
 using namespace std;
@@ -369,7 +371,7 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
 // ---------------------------------------------------------------------
 /* This takes the list of source list expressed entires and collects
    similar ones to form a single entry for each dist */
-void pkgCdrom::ReduceSourcelist(string CD,vector<string> &List)
+void pkgCdrom::ReduceSourcelist(string /*CD*/,vector<string> &List)
 {
    sort(List.begin(),List.end());
    
@@ -440,7 +442,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
    Out.close();
 
    if (FileExists(DFile) == true)
-      rename(DFile.c_str(), string(DFile + '~').c_str());
+      rename(DFile.c_str(), (DFile + '~').c_str());
    if (rename(NewFile.c_str(),DFile.c_str()) != 0)
       return _error->Errno("rename","Failed to rename %s.new to %s",
 			   DFile.c_str(),DFile.c_str());
@@ -553,7 +555,7 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
    
    Out.close();
 
-   rename(File.c_str(),string(File + '~').c_str());
+   rename(File.c_str(), (File + '~').c_str());
    if (rename(NewFile.c_str(),File.c_str()) != 0)
       return _error->Errno("rename","Failed to rename %s.new to %s",
 			   File.c_str(),File.c_str());
@@ -561,7 +563,16 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
    return true;
 }
 									/*}}}*/
-bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log)/*{{{*/
+bool pkgCdrom::UnmountCDROM(std::string const &CDROM, pkgCdromStatus * const log)/*{{{*/
+{
+   if (_config->FindB("APT::CDROM::NoMount",false) == true)
+      return true;
+   if (log != NULL)
+      log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
+   return UnmountCdrom(CDROM);
+}
+									/*}}}*/
+bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log, bool const interactive)/*{{{*/
 {
    // Startup
    CDROM = _config->FindDir("Acquire::cdrom::mount");
@@ -579,16 +590,17 @@ bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, s
    // Unmount the CD and get the user to put in the one they want
    if (_config->FindB("APT::CDROM::NoMount", false) == false)
    {
-      if(log != NULL)
-	 log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT);
-      UnmountCdrom(CDROM);
-
-      if(log != NULL)
+      if (interactive == true)
       {
-	 log->Update(_("Waiting for disc...\n"), STEP_WAIT);
-	 if(!log->ChangeCdrom()) {
-	    // user aborted
-	    return false;
+	 UnmountCDROM(CDROM, log);
+
+	 if(log != NULL)
+	 {
+	    log->Update(_("Waiting for disc...\n"), STEP_WAIT);
+	    if(!log->ChangeCdrom()) {
+	       // user aborted
+	       return false;
+	    }
 	 }
       }
 
@@ -600,15 +612,19 @@ bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, s
 	 return _error->Error("Failed to mount the cdrom.");
    }
 
+   if (IsMounted(CDROM) == false)
+      return _error->Error("Failed to mount the cdrom.");
+
    // Hash the CD to get an ID
    if (log != NULL)
-      log->Update(_("Identifying.. "), STEP_IDENT);
+      log->Update(_("Identifying... "), STEP_IDENT);
 
    if (IdentCdrom(CDROM,ident) == false)
    {
       ident = "";
       if (log != NULL)
 	 log->Update("\n");
+      UnmountCDROM(CDROM, NULL);
       return false;
    }
 
@@ -624,8 +640,11 @@ bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, s
    if (FileExists(DFile) == true)
    {
       if (ReadConfigFile(Database,DFile) == false)
+      {
+	 UnmountCDROM(CDROM, NULL);
 	 return _error->Error("Unable to read the cdrom database %s",
 			      DFile.c_str());
+      }
    }
    return true;
 }
@@ -634,7 +653,7 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)		/*{{{*/
 {
    Configuration Database;
    std::string CDROM;
-   if (MountAndIdentCDROM(Database, CDROM, ident, log) == false)
+   if (MountAndIdentCDROM(Database, CDROM, ident, log, false) == false)
       return false;
 
    if (log != NULL)
@@ -646,13 +665,7 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)		/*{{{*/
    }
 
    // Unmount and finish
-   if (_config->FindB("APT::CDROM::NoMount",false) == false)
-   {
-      if (log != NULL)
-	 log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
-      UnmountCdrom(CDROM);
-   }
-
+   UnmountCDROM(CDROM, log);
    return true;
 }
 									/*}}}*/
@@ -660,11 +673,11 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
 {
    Configuration Database;
    std::string ID, CDROM;
-   if (MountAndIdentCDROM(Database, CDROM, ID, log) == false)
+   if (MountAndIdentCDROM(Database, CDROM, ID, log, true) == false)
       return false;
 
    if(log != NULL)
-      log->Update(_("Scanning disc for index files..\n"),STEP_SCAN);
+      log->Update(_("Scanning disc for index files...\n"),STEP_SCAN);
 
    // Get the CD structure
    vector<string> List;
@@ -677,11 +690,15 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
    {
       if (log != NULL)
 	 log->Update("\n");
+      UnmountCDROM(CDROM, NULL);
       return false;
    }
 
    if (chdir(StartDir.c_str()) != 0)
+   {
+      UnmountCDROM(CDROM, NULL);
       return _error->Errno("chdir","Unable to change to %s", StartDir.c_str());
+   }
 
    if (_config->FindB("Debug::aptcdrom",false) == true)
    {
@@ -723,8 +740,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
 
    if (List.empty() == true && SourceList.empty() == true) 
    {
-      if (_config->FindB("APT::CDROM::NoMount",false) == false) 
-	 UnmountCdrom(CDROM);
+      UnmountCDROM(CDROM, NULL);
       return _error->Error(_("Unable to locate any package files, perhaps this is not a Debian Disc or the wrong architecture?"));
    }
 
@@ -737,7 +753,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
       if (InfoDir.empty() == false &&
 	  FileExists(InfoDir + "/info") == true)
       {
-	 ifstream F(string(InfoDir + "/info").c_str());
+	 ifstream F((InfoDir + "/info").c_str());
 	 if (!F == 0)
 	    getline(F,Name);
 
@@ -764,14 +780,14 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
       {
 	 if(log == NULL) 
          {
-	    if (_config->FindB("APT::CDROM::NoMount",false) == false) 
-	       UnmountCdrom(CDROM);
+	    UnmountCDROM(CDROM, NULL);
 	    return _error->Error("No disc name found and no way to ask for it");
 	 }
 
 	 while(true) {
 	    if(!log->AskCdromName(Name)) {
 	       // user canceld
+	       UnmountCDROM(CDROM, NULL);
 	       return false; 
 	    }
 	    cout << "Name: '" << Name << "'" << endl;
@@ -808,7 +824,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
    string const partialListDir = listDir + "partial/";
    if (CreateAPTDirectoryIfNeeded(_config->FindDir("Dir::State"), partialListDir) == false &&
        CreateAPTDirectoryIfNeeded(listDir, partialListDir) == false)
+   {
+      UnmountCDROM(CDROM, NULL);
       return _error->Errno("cdrom", _("List directory %spartial is missing."), listDir.c_str());
+   }
 
    // take care of the signatures and copy them if they are ok
    // (we do this before PackageCopy as it modifies "List" and "SourceList")
@@ -822,7 +841,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
    if (Copy.CopyPackages(CDROM,Name,List, log) == false ||
        SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false ||
        TransCopy.CopyTranslations(CDROM,Name,TransList, log) == false)
+   {
+      UnmountCDROM(CDROM, NULL);
       return false;
+   }
 
    // reduce the List so that it takes less space in sources.list
    ReduceSourcelist(CDROM,List);
@@ -832,13 +854,19 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
    if (_config->FindB("APT::cdrom::NoAct",false) == false)
    {
       if (WriteDatabase(Database) == false)
+      {
+	 UnmountCDROM(CDROM, NULL);
 	 return false;
-      
+      }
+
       if(log != NULL)
 	 log->Update(_("Writing new source list\n"), STEP_WRITE);
       if (WriteSourceList(Name,List,false) == false ||
 	  WriteSourceList(Name,SourceList,true) == false)
+      {
+	 UnmountCDROM(CDROM, NULL);
 	 return false;
+      }
    }
 
    // Print the sourcelist entries
@@ -850,8 +878,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
       {
-	 if (_config->FindB("APT::CDROM::NoMount",false) == false) 
-	    UnmountCdrom(CDROM);
+	 UnmountCDROM(CDROM, NULL);
 	 return _error->Error("Internal error");
       }
 
@@ -869,8 +896,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
       {
-	 if (_config->FindB("APT::CDROM::NoMount",false) == false) 
-	    UnmountCdrom(CDROM);
+	 UnmountCDROM(CDROM, NULL);
 	 return _error->Error("Internal error");
       }
 
@@ -883,12 +909,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
    }
 
    // Unmount and finish
-   if (_config->FindB("APT::CDROM::NoMount",false) == false) {
-      if (log != NULL)
-	 log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
-      UnmountCdrom(CDROM);
-   }
-
+   UnmountCDROM(CDROM, log);
    return true;
 }
 									/*}}}*/
@@ -933,10 +954,10 @@ pkgUdevCdromDevices::Dlopen()                     		        /*{{{*/
 // convenience interface, this will just call ScanForRemovable
 vector<CdromDevice>
 pkgUdevCdromDevices::Scan()
-{ 
+{
    bool CdromOnly = _config->FindB("APT::cdrom::CdromOnly", true);
-   return ScanForRemovable(CdromOnly); 
-};
+   return ScanForRemovable(CdromOnly);
+}
 									/*}}}*/
                                                                         /*{{{*/
 vector<CdromDevice>
@@ -981,7 +1002,7 @@ pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)
       cdrom.DeviceName = string(devnode);
       if (mountpath != "") {
 	 cdrom.MountPath = mountpath;
-	 string s = string(mountpath);
+	 string s = mountpath;
 	 cdrom.Mounted = IsMounted(s);
       } else {
 	 cdrom.Mounted = false;
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index c58593550..bd0902176 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -1,9 +1,13 @@
 #ifndef PKGLIB_CDROM_H
 #define PKGLIB_CDROM_H
 
+#include <apt-pkg/macros.h>
+
 #include<string>
 #include<vector>
 
+#include <stddef.h>
+
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/init.h>
 using namespace std;
@@ -71,8 +75,9 @@ class pkgCdrom								/*{{{*/
    bool Add(pkgCdromStatus *log);
 
  private:
-   bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,
-	 std::string &ident, pkgCdromStatus * const log);
+   APT_HIDDEN bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,
+	 std::string &ident, pkgCdromStatus * const log, bool const interactive);
+   APT_HIDDEN bool UnmountCDROM(std::string const &CDROM, pkgCdromStatus * const log);
 };
 									/*}}}*/
 
diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index 2dea8ffdd..0ee3b765d 100644
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -16,7 +16,11 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
+#include <string>
+#include <string.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h
index ad4049e83..930d54a7f 100644
--- a/apt-pkg/clean.h
+++ b/apt-pkg/clean.h
@@ -10,8 +10,13 @@
 #ifndef APTPKG_CLEAN_H
 #define APTPKG_CLEAN_H
 
-
+#ifndef APT_10_CLEANER_HEADERS
 #include <apt-pkg/pkgcache.h>
+#endif
+
+#include <string>
+
+class pkgCache;
 
 class pkgArchiveCleaner
 {
diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index 20210ec0a..936e377fb 100644
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -19,7 +19,11 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 
-#include <sys/wait.h>
+#include <stdlib.h>
+#include <string.h>
+#include <iostream>
+#include <string>
+#include <vector>
 #include <sys/statvfs.h>
 #include <dirent.h>
 #include <fcntl.h>
@@ -42,11 +46,16 @@ bool IsMounted(string &Path)
 {
    if (Path.empty() == true)
       return false;
-   
+
    // Need that trailing slash for directories
    if (Path[Path.length() - 1] != '/')
       Path += '/';
-   
+
+   // if the path has a ".disk" directory we treat it as mounted
+   // this way even extracted copies of disks are recognized
+   if (DirectoryExists(Path + ".disk/") == true)
+      return true;
+
    /* First we check if the path is actually mounted, we do this by
       stating the path and the previous directory (careful of links!)
       and comparing their device fields. */
@@ -66,7 +75,13 @@ bool IsMounted(string &Path)
    leave /etc/mtab inconsitant. We drop all messages this produces. */
 bool UnmountCdrom(string Path)
 {
-   if (IsMounted(Path) == false)
+   // do not generate errors, even if the mountpoint does not exist
+   // the mountpoint might be auto-created by the mount command
+   // and a non-existing mountpoint is surely not mounted
+   _error->PushToStack();
+   bool const mounted = IsMounted(Path);
+   _error->RevertToStack();
+   if (mounted == false)
       return true;
 
    for (int i=0;i<3;i++)
@@ -78,8 +93,9 @@ bool UnmountCdrom(string Path)
       if (Child == 0)
       {
 	 // Make all the fds /dev/null
-	 for (int I = 0; I != 3; I++)
-	    dup2(open("/dev/null",O_RDWR),I);
+	 int const null_fd = open("/dev/null",O_RDWR);
+	 for (int I = 0; I != 3; ++I)
+	    dup2(null_fd, I);
 
 	 if (_config->Exists("Acquire::cdrom::"+Path+"::UMount") == true)
 	 {
@@ -113,19 +129,24 @@ bool UnmountCdrom(string Path)
 /* We fork mount and drop all messages */
 bool MountCdrom(string Path, string DeviceName)
 {
-   if (IsMounted(Path) == true)
+   // do not generate errors, even if the mountpoint does not exist
+   // the mountpoint might be auto-created by the mount command
+   _error->PushToStack();
+   bool const mounted = IsMounted(Path);
+   _error->RevertToStack();
+   if (mounted == true)
       return true;
-   
+
    int Child = ExecFork();
 
    // The child
    if (Child == 0)
    {
       // Make all the fds /dev/null
-      int null_fd = open("/dev/null",O_RDWR);
-      for (int I = 0; I != 3; I++)
+      int const null_fd = open("/dev/null",O_RDWR);
+      for (int I = 0; I != 3; ++I)
 	 dup2(null_fd, I);
-      
+
       if (_config->Exists("Acquire::cdrom::"+Path+"::Mount") == true)
       {
 	 if (system(_config->Find("Acquire::cdrom::"+Path+"::Mount").c_str()) != 0)
@@ -242,37 +263,34 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
    return true;   
 }
 									/*}}}*/
-
 // FindMountPointForDevice - Find mountpoint for the given device	/*{{{*/
 string FindMountPointForDevice(const char *devnode)
 {
-   char buf[255];
-   char *out[10];
-   int i=0;
-
    // this is the order that mount uses as well
-   const char *mount[] = { "/etc/mtab", 
-                           "/proc/mount", 
-                           NULL };
+   std::vector<std::string> const mounts = _config->FindVector("Dir::state::MountPoints", "/etc/mtab,/proc/mount");
 
-   for (i=0; mount[i] != NULL; i++) {
-      if (FileExists(mount[i])) {
-         FILE *f=fopen(mount[i], "r");
-         while ( fgets(buf, sizeof(buf), f) != NULL) {
-            if (strncmp(buf, devnode, strlen(devnode)) == 0) {
-               if(TokSplitString(' ', buf, out, 10))
-               {
-                  fclose(f);
-                  // unescape the \0XXX chars in the path
-                  string mount_point = out[1];
-                  return DeEscapeString(mount_point);
-               }
-            }
-         }
-         fclose(f);
+   for (std::vector<std::string>::const_iterator m = mounts.begin(); m != mounts.end(); ++m)
+      if (FileExists(*m) == true)
+      {
+	 char * line = NULL;
+	 size_t line_len = 0;
+	 FILE * f = fopen(m->c_str(), "r");
+	 while(getline(&line, &line_len, f) != -1)
+	 {
+	    char * out[] = { NULL, NULL, NULL };
+	    TokSplitString(' ', line, out, 3);
+	    if (out[2] != NULL || out[1] == NULL || out[0] == NULL)
+	       continue;
+	    if (strcmp(out[0], devnode) != 0)
+	       continue;
+	    fclose(f);
+	    // unescape the \0XXX chars in the path
+	    string mount_point = out[1];
+	    return DeEscapeString(mount_point);
+	 }
+	 fclose(f);
       }
-   }
-   
+
    return string();
 }
 									/*}}}*/
diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index ed5800007..3799c822d 100644
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -18,6 +18,11 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+
 #include <apti18n.h>
 									/*}}}*/
 using namespace std;
diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index 180276633..143df58b2 100644
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -44,6 +44,8 @@
 #ifndef PKGLIB_CMNDLINE_H
 #define PKGLIB_CMNDLINE_H
 
+#include <apt-pkg/macros.h>
+
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/configuration.h>
 #endif
@@ -80,14 +82,14 @@ class CommandLine
    
    bool Parse(int argc,const char **argv);
    void ShowHelp();
-   unsigned int FileSize() const;
+   unsigned int FileSize() const APT_PURE;
    bool DispatchArg(Dispatch *List,bool NoMatch = true);
       
    static char const * GetCommand(Dispatch const * const Map,
-	 unsigned int const argc, char const * const * const argv);
+	 unsigned int const argc, char const * const * const argv) APT_PURE;
 
    static CommandLine::Args MakeArgs(char ShortOpt, char const *LongOpt,
-	 char const *ConfName, unsigned long Flags);
+	 char const *ConfName, unsigned long Flags) APT_CONST;
 
    CommandLine(Args *AList,Configuration *Conf);
    ~CommandLine();
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 4ef4663c0..00f6ad0f9 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -21,10 +21,18 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
-
+#include <apt-pkg/macros.h>
+
+#include <ctype.h>
+#include <regex.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+#include <string>
 #include <vector>
 #include <fstream>
-#include <iostream>
 
 #include <apti18n.h>
 
@@ -42,8 +50,7 @@ Configuration::Configuration() : ToFree(true)
 }
 Configuration::Configuration(const Item *Root) : Root((Item *)Root), ToFree(false)
 {
-};
-
+}
 									/*}}}*/
 // Configuration::~Configuration - Destructor				/*{{{*/
 // ---------------------------------------------------------------------
@@ -246,12 +253,18 @@ string Configuration::FindDir(const char *Name,const char *Default) const
 // Configuration::FindVector - Find a vector of values			/*{{{*/
 // ---------------------------------------------------------------------
 /* Returns a vector of config values under the given item */
-vector<string> Configuration::FindVector(const char *Name) const
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
+vector<string> Configuration::FindVector(const char *Name) const { return FindVector(Name, ""); }
+#endif
+vector<string> Configuration::FindVector(const char *Name, std::string const &Default) const
 {
    vector<string> Vec;
    const Item *Top = Lookup(Name);
    if (Top == NULL)
-      return Vec;
+      return VectorizeString(Default, ',');
+
+   if (Top->Value.empty() == false)
+      return VectorizeString(Top->Value, ',');
 
    Item *I = Top->Child;
    while(I != NULL)
@@ -259,6 +272,9 @@ vector<string> Configuration::FindVector(const char *Name) const
       Vec.push_back(I->Value);
       I = I->Next;
    }
+   if (Vec.empty() == true)
+      return VectorizeString(Default, ',');
+
    return Vec;
 }
 									/*}}}*/
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 8e09ea0a6..c256139f4 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -74,8 +74,22 @@ class Configuration
    std::string Find(std::string const &Name, std::string const &Default) const {return Find(Name.c_str(),Default.c_str());};
    std::string FindFile(const char *Name,const char *Default = 0) const;
    std::string FindDir(const char *Name,const char *Default = 0) const;
+   /** return a list of child options
+    *
+    * Options like Acquire::Languages are handled as lists which
+    * can be overridden and have a default. For the later two a comma
+    * separated list of values is supported.
+    *
+    * \param Name of the parent node
+    * \param Default list of values separated by commas */
+   std::vector<std::string> FindVector(const char *Name, std::string const &Default) const;
+   std::vector<std::string> FindVector(std::string const &Name, std::string const &Default) const { return FindVector(Name.c_str(), Default); };
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+   std::vector<std::string> FindVector(const char *Name) const { return FindVector(Name, ""); };
+#else
    std::vector<std::string> FindVector(const char *Name) const;
-   std::vector<std::string> FindVector(std::string const &Name) const { return FindVector(Name.c_str()); };
+#endif
+   std::vector<std::string> FindVector(std::string const &Name) const { return FindVector(Name.c_str(), ""); };
    int FindI(const char *Name,int const &Default = 0) const;
    int FindI(std::string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);};
    bool FindB(const char *Name,bool const &Default = false) const;
diff --git a/apt-pkg/contrib/crc-16.h b/apt-pkg/contrib/crc-16.h
index 702de40b2..08acdafb7 100644
--- a/apt-pkg/contrib/crc-16.h
+++ b/apt-pkg/contrib/crc-16.h
@@ -10,8 +10,10 @@
 #ifndef APTPKG_CRC16_H
 #define APTPKG_CRC16_H
 
+#include <apt-pkg/macros.h>
+
 #define INIT_FCS  0xffff
 unsigned short AddCRC16(unsigned short fcs, void const *buf,
-			unsigned long long len);
+			unsigned long long len) APT_PURE;
 
 #endif
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index d457781c3..892cd4874 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -17,12 +17,14 @@
 
 #include <apt-pkg/error.h>
 
+#include <stdarg.h>
+#include <stddef.h>
+#include <list>
 #include <iostream>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-
 #include <string>
 #include <cstring>
 
@@ -223,7 +225,7 @@ void GlobalError::DumpErrors(std::ostream &out, MsgType const &threshold,
 void GlobalError::Discard() {
 	Messages.clear();
 	PendingFlag = false;
-};
+}
 									/*}}}*/
 // GlobalError::empty - does our error list include anything?		/*{{{*/
 bool GlobalError::empty(MsgType const &trashhold) const {
diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index bcee70b1a..ed8c19153 100644
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -46,6 +46,7 @@
 #include <list>
 #include <string>
 
+#include <stddef.h>
 #include <stdarg.h>
 
 class GlobalError							/*{{{*/
@@ -73,7 +74,7 @@ public:									/*{{{*/
 	 *
 	 *  \return \b false
 	 */
-	bool FatalE(const char *Function,const char *Description,...) __like_printf(3) __cold;
+	bool FatalE(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD;
 
 	/** \brief add an Error message with errno to the list
 	 *
@@ -82,7 +83,7 @@ public:									/*{{{*/
 	 *
 	 *  \return \b false
 	 */
-	bool Errno(const char *Function,const char *Description,...) __like_printf(3) __cold;
+	bool Errno(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD;
 
 	/** \brief add a warning message with errno to the list
 	 *
@@ -94,7 +95,7 @@ public:									/*{{{*/
 	 *
 	 *  \return \b false
 	 */
-	bool WarningE(const char *Function,const char *Description,...) __like_printf(3) __cold;
+	bool WarningE(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD;
 
 	/** \brief add a notice message with errno to the list
 	 *
@@ -103,7 +104,7 @@ public:									/*{{{*/
 	 *
 	 *  \return \b false
 	 */
-	bool NoticeE(const char *Function,const char *Description,...) __like_printf(3) __cold;
+	bool NoticeE(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD;
 
 	/** \brief add a debug message with errno to the list
 	 *
@@ -112,7 +113,7 @@ public:									/*{{{*/
 	 *
 	 *  \return \b false
 	 */
-	bool DebugE(const char *Function,const char *Description,...) __like_printf(3) __cold;
+	bool DebugE(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD;
 
 	/** \brief adds an errno message with the given type
 	 *
@@ -121,7 +122,7 @@ public:									/*{{{*/
 	 * \param Description of the error
 	 */
 	bool InsertErrno(MsgType const &type, const char* Function,
-			 const char* Description,...) __like_printf(4) __cold;
+			 const char* Description,...) APT_PRINTF(4) APT_COLD;
 
 	/** \brief adds an errno message with the given type
 	 *
@@ -140,7 +141,7 @@ public:									/*{{{*/
 	 */
 	bool InsertErrno(MsgType type, const char* Function,
 			 const char* Description, va_list &args,
-			 int const errsv, size_t &msgSize);
+			 int const errsv, size_t &msgSize) APT_COLD;
 
 	/** \brief add an fatal error message to the list
 	 *
@@ -155,7 +156,7 @@ public:									/*{{{*/
 	 *
 	 *  \return \b false
 	 */
-	bool Fatal(const char *Description,...) __like_printf(2) __cold;
+	bool Fatal(const char *Description,...) APT_PRINTF(2) APT_COLD;
 
 	/** \brief add an Error message to the list
 	 *
@@ -163,7 +164,7 @@ public:									/*{{{*/
 	 *
 	 *  \return \b false
 	 */
-	bool Error(const char *Description,...) __like_printf(2) __cold;
+	bool Error(const char *Description,...) APT_PRINTF(2) APT_COLD;
 
 	/** \brief add a warning message to the list
 	 *
@@ -174,7 +175,7 @@ public:									/*{{{*/
 	 *
 	 *  \return \b false
 	 */
-	bool Warning(const char *Description,...) __like_printf(2) __cold;
+	bool Warning(const char *Description,...) APT_PRINTF(2) APT_COLD;
 
 	/** \brief add a notice message to the list
 	 *
@@ -187,7 +188,7 @@ public:									/*{{{*/
 	 *
 	 *  \return \b false
 	 */
-	bool Notice(const char *Description,...) __like_printf(2) __cold;
+	bool Notice(const char *Description,...) APT_PRINTF(2) APT_COLD;
 
 	/** \brief add a debug message to the list
 	 *
@@ -195,14 +196,14 @@ public:									/*{{{*/
 	 *
 	 *  \return \b false
 	 */
-	bool Debug(const char *Description,...) __like_printf(2) __cold;
+	bool Debug(const char *Description,...) APT_PRINTF(2) APT_COLD;
 
 	/** \brief adds an error message with the given type
 	 *
 	 * \param type of the error message
 	 * \param Description of the error
 	 */
-	bool Insert(MsgType const &type, const char* Description,...) __like_printf(3) __cold;
+	bool Insert(MsgType const &type, const char* Description,...) APT_PRINTF(3) APT_COLD;
 
 	/** \brief adds an error message with the given type
 	 *
@@ -218,13 +219,13 @@ public:									/*{{{*/
 	 * should call this method again in that case
 	 */
 	bool Insert(MsgType type, const char* Description,
-			 va_list &args, size_t &msgSize) __cold;
+			 va_list &args, size_t &msgSize) APT_COLD;
 
 	/** \brief is an error in the list?
 	 *
 	 *  \return \b true if an error is included in the list, \b false otherwise
 	 */
-	inline bool PendingError() const {return PendingFlag;};
+	inline bool PendingError() const APT_PURE {return PendingFlag;};
 
 	/** \brief is the list empty?
 	 *
@@ -232,11 +233,11 @@ public:									/*{{{*/
 	 *  if you want to check if also no notices happened set the parameter
 	 *  flag to \b false.
 	 *
-	 *  \param WithoutNotice does notices count, default is \b true, so no
+	 *  \param threshold minimim level considered
 	 *
 	 *  \return \b true if an the list is empty, \b false otherwise
 	 */
-	bool empty(MsgType const &trashhold = WARNING) const;
+	bool empty(MsgType const &threshold = WARNING) const APT_PURE;
 
 	/** \brief returns and removes the first (or last) message in the list
 	 *
@@ -302,7 +303,7 @@ public:									/*{{{*/
 	void MergeWithStack();
 
 	/** \brief return the deep of the stack */
-	size_t StackCount() const {
+	size_t StackCount() const APT_PURE {
 		return Stacks.size();
 	}
 
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 9da5ac84e..5466feb4d 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: fileutl.cc,v 1.42 2002/09/14 05:29:22 jgg Exp $
 /* ######################################################################
    
    File Utilities
@@ -26,16 +25,22 @@
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
-
+#include <apt-pkg/macros.h>
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <sys/select.h>
+#include <time.h>
+#include <string>
+#include <vector>
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
-
 #include <iostream>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <dirent.h>
@@ -52,64 +57,17 @@
 #ifdef HAVE_BZ2
 	#include <bzlib.h>
 #endif
-
-#ifdef WORDS_BIGENDIAN
-#include <inttypes.h>
+#ifdef HAVE_LZMA
+	#include <lzma.h>
 #endif
+#include <endian.h>
+#include <stdint.h>
 
 #include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
 
-class FileFdPrivate {
-	public:
-#ifdef HAVE_ZLIB
-	gzFile gz;
-#else
-	void* gz;
-#endif
-#ifdef HAVE_BZ2
-	BZFILE* bz2;
-#else
-	void* bz2;
-#endif
-	int compressed_fd;
-	pid_t compressor_pid;
-	bool pipe;
-	APT::Configuration::Compressor compressor;
-	unsigned int openmode;
-	unsigned long long seekpos;
-	FileFdPrivate() : gz(NULL), bz2(NULL),
-			  compressed_fd(-1), compressor_pid(-1), pipe(false),
-			  openmode(0), seekpos(0) {};
-	bool CloseDown(std::string const &FileName)
-	{
-	   bool Res = true;
-#ifdef HAVE_ZLIB
-	   if (gz != NULL) {
-	      int const e = gzclose(gz);
-	      gz = NULL;
-	      // gzdclose() on empty files always fails with "buffer error" here, ignore that
-	      if (e != 0 && e != Z_BUF_ERROR)
-		 Res &= _error->Errno("close",_("Problem closing the gzip file %s"), FileName.c_str());
-	   }
-#endif
-#ifdef HAVE_BZ2
-	   if (bz2 != NULL) {
-	      BZ2_bzclose(bz2);
-	      bz2 = NULL;
-	   }
-#endif
-	   if (compressor_pid > 0)
-	      ExecWait(compressor_pid, "FileFdCompressor", true);
-	   compressor_pid = -1;
-
-	   return Res;
-	}
-	~FileFdPrivate() { CloseDown(""); }
-};
-
 // RunScripts - Run a set of scripts from a configuration subtree	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -143,7 +101,11 @@ bool RunScripts(const char *Cnf)
       {
 	 if (Opts->Value.empty() == true)
 	    continue;
-	 
+
+         if(_config->FindB("Debug::RunScripts", false) == true)
+            std::clog << "Running external script: '"
+                      << Opts->Value << "'" << std::endl;
+
 	 if (system(Opts->Value.c_str()) != 0)
 	    _exit(100+Count);
       }
@@ -874,6 +836,7 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap)
 }
 									/*}}}*/
 
+
 // StartsWithGPGClearTextSignature - Check if a file is Pgp/GPG clearsigned     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -894,13 +857,129 @@ bool StartsWithGPGClearTextSignature(string const &FileName)
 }
 
 
+class FileFdPrivate {							/*{{{*/
+	public:
+#ifdef HAVE_ZLIB
+	gzFile gz;
+#endif
+#ifdef HAVE_BZ2
+	BZFILE* bz2;
+#endif
+#ifdef HAVE_LZMA
+	struct LZMAFILE {
+	   FILE* file;
+	   uint8_t buffer[4096];
+	   lzma_stream stream;
+	   lzma_ret err;
+	   bool eof;
+	   bool compressing;
+
+	   LZMAFILE() : file(NULL), eof(false), compressing(false) {}
+	   ~LZMAFILE() {
+	      if (compressing == true)
+	      {
+		for (;;) {
+			stream.avail_out = sizeof(buffer)/sizeof(buffer[0]);
+			stream.next_out = buffer;
+			err = lzma_code(&stream, LZMA_FINISH);
+			if (err != LZMA_OK && err != LZMA_STREAM_END)
+			{
+				_error->Error("~LZMAFILE: Compress finalisation failed");
+				break;
+			}
+			size_t const n =  sizeof(buffer)/sizeof(buffer[0]) - stream.avail_out;
+			if (n && fwrite(buffer, 1, n, file) != n)
+			{
+				_error->Errno("~LZMAFILE",_("Write error"));
+				break;
+			}
+			if (err == LZMA_STREAM_END)
+				break;
+		}
+	      }
+	      lzma_end(&stream);
+	      fclose(file);
+	   }
+	};
+	LZMAFILE* lzma;
+#endif
+	int compressed_fd;
+	pid_t compressor_pid;
+	bool pipe;
+	APT::Configuration::Compressor compressor;
+	unsigned int openmode;
+	unsigned long long seekpos;
+	FileFdPrivate() :
+#ifdef HAVE_ZLIB
+			  gz(NULL),
+#endif
+#ifdef HAVE_BZ2
+			  bz2(NULL),
+#endif
+#ifdef HAVE_LZMA
+			  lzma(NULL),
+#endif
+			  compressed_fd(-1), compressor_pid(-1), pipe(false),
+			  openmode(0), seekpos(0) {};
+	bool InternalClose(std::string const &FileName)
+	{
+	   if (false)
+	      /* dummy so that the rest can be 'else if's */;
+#ifdef HAVE_ZLIB
+	   else if (gz != NULL) {
+	      int const e = gzclose(gz);
+	      gz = NULL;
+	      // gzdclose() on empty files always fails with "buffer error" here, ignore that
+	      if (e != 0 && e != Z_BUF_ERROR)
+		 return _error->Errno("close",_("Problem closing the gzip file %s"), FileName.c_str());
+	   }
+#endif
+#ifdef HAVE_BZ2
+	   else if (bz2 != NULL) {
+	      BZ2_bzclose(bz2);
+	      bz2 = NULL;
+	   }
+#endif
+#ifdef HAVE_LZMA
+	   else if (lzma != NULL) {
+	      delete lzma;
+	      lzma = NULL;
+	   }
+#endif
+	   return true;
+	}
+	bool CloseDown(std::string const &FileName)
+	{
+	   bool const Res = InternalClose(FileName);
+
+	   if (compressor_pid > 0)
+	      ExecWait(compressor_pid, "FileFdCompressor", true);
+	   compressor_pid = -1;
+
+	   return Res;
+	}
+	bool InternalStream() const {
+	   return false
+#ifdef HAVE_BZ2
+	      || bz2 != NULL
+#endif
+#ifdef HAVE_LZMA
+	      || lzma != NULL
+#endif
+	      ;
+	}
+
+
+	~FileFdPrivate() { CloseDown(""); }
+};
+									/*}}}*/
 // FileFd::Open - Open a file						/*{{{*/
 // ---------------------------------------------------------------------
 /* The most commonly used open mode combinations are given with Mode */
-bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress, unsigned long const Perms)
+bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress, unsigned long const AccessMode)
 {
    if (Mode == ReadOnlyGzip)
-      return Open(FileName, ReadOnly, Gzip, Perms);
+      return Open(FileName, ReadOnly, Gzip, AccessMode);
 
    if (Compress == Auto && (Mode & WriteOnly) == WriteOnly)
       return FileFdError("Autodetection on %s only works in ReadOnly openmode!", FileName.c_str());
@@ -911,7 +990,7 @@ bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress,
    {
       for (; compressor != compressors.end(); ++compressor)
       {
-	 std::string file = std::string(FileName).append(compressor->Extension);
+	 std::string file = FileName + compressor->Extension;
 	 if (FileExists(file) == false)
 	    continue;
 	 FileName = file;
@@ -967,9 +1046,9 @@ bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress,
 
    if (compressor == compressors.end())
       return FileFdError("Can't find a match for specified compressor mode for file %s", FileName.c_str());
-   return Open(FileName, Mode, *compressor, Perms);
+   return Open(FileName, Mode, *compressor, AccessMode);
 }
-bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor, unsigned long const Perms)
+bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor, unsigned long const AccessMode)
 {
    Close();
    Flags = AutoClose;
@@ -1019,11 +1098,18 @@ bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Co
       TemporaryFileName = string(name);
       free(name);
 
-      if(Perms != 600 && fchmod(iFd, Perms) == -1)
+      // umask() will always set the umask and return the previous value, so
+      // we first set the umask and then reset it to the old value
+      mode_t const CurrentUmask = umask(0);
+      umask(CurrentUmask);
+      // calculate the actual file permissions (just like open/creat)
+      mode_t const FilePermissions = (AccessMode & ~CurrentUmask);
+
+      if(fchmod(iFd, FilePermissions) == -1)
           return FileFdErrno("fchmod", "Could not change permissions for temporary file %s", TemporaryFileName.c_str());
    }
    else
-      iFd = open(FileName.c_str(), fileflags, Perms);
+      iFd = open(FileName.c_str(), fileflags, AccessMode);
 
    this->FileName = FileName;
    if (iFd == -1 || OpenInternDescriptor(Mode, compressor) == false)
@@ -1081,30 +1167,12 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration:
 {
    Close();
    Flags = (AutoClose) ? FileFd::AutoClose : 0;
-   if (AutoClose == false && (
-#ifdef HAVE_ZLIB
-	compressor.Name == "gzip" ||
-#endif
-#ifdef HAVE_BZ2
-	compressor.Name == "bzip2" ||
-#endif
-	false))
-   {
-      // Need to duplicate fd here or gzclose for cleanup will close the fd as well
-      iFd = dup(Fd);
-   }
-   else
-      iFd = Fd;
+   iFd = Fd;
    this->FileName = "";
-   if (Fd == -1 || OpenInternDescriptor(Mode, compressor) == false)
+   if (OpenInternDescriptor(Mode, compressor) == false)
    {
       if (iFd != -1 && (
-#ifdef HAVE_ZLIB
-	compressor.Name == "gzip" ||
-#endif
-#ifdef HAVE_BZ2
-	compressor.Name == "bzip2" ||
-#endif
+	(Flags & Compressed) == Compressed ||
 	AutoClose == true))
       {
 	 close (iFd);
@@ -1116,52 +1184,121 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration:
 }
 bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor)
 {
+   if (iFd == -1)
+      return false;
    if (compressor.Name == "." || compressor.Binary.empty() == true)
       return true;
 
+#if defined HAVE_ZLIB || defined HAVE_BZ2 || defined HAVE_LZMA
+   // the API to open files is similar, so setup to avoid code duplicates later
+   // and while at it ensure that we close before opening (if its a reopen)
+   void* (*compress_open)(int, const char *) = NULL;
+   if (false)
+      /* dummy so that the rest can be 'else if's */;
+#define APT_COMPRESS_INIT(NAME,OPEN) \
+   else if (compressor.Name == NAME) \
+   { \
+      compress_open = (void*(*)(int, const char *)) OPEN; \
+      if (d != NULL) d->InternalClose(FileName); \
+   }
+#ifdef HAVE_ZLIB
+   APT_COMPRESS_INIT("gzip", gzdopen)
+#endif
+#ifdef HAVE_BZ2
+   APT_COMPRESS_INIT("bzip2", BZ2_bzdopen)
+#endif
+#ifdef HAVE_LZMA
+   APT_COMPRESS_INIT("xz", fdopen)
+   APT_COMPRESS_INIT("lzma", fdopen)
+#endif
+#undef APT_COMPRESS_INIT
+#endif
+
    if (d == NULL)
    {
       d = new FileFdPrivate();
       d->openmode = Mode;
       d->compressor = compressor;
+#if defined HAVE_ZLIB || defined HAVE_BZ2 || defined HAVE_LZMA
+      if ((Flags & AutoClose) != AutoClose && compress_open != NULL)
+      {
+	 // Need to duplicate fd here or gz/bz2 close for cleanup will close the fd as well
+	 int const internFd = dup(iFd);
+	 if (internFd == -1)
+	    return FileFdErrno("OpenInternDescriptor", _("Could not open file descriptor %d"), iFd);
+	 iFd = internFd;
+      }
+#endif
    }
 
-#ifdef HAVE_ZLIB
-   if (compressor.Name == "gzip")
+#if defined HAVE_ZLIB || defined HAVE_BZ2 || defined HAVE_LZMA
+   if (compress_open != NULL)
    {
-      if (d->gz != NULL)
-      {
-	 gzclose(d->gz);
-	 d->gz = NULL;
-      }
+      void* compress_struct = NULL;
       if ((Mode & ReadWrite) == ReadWrite)
-	 d->gz = gzdopen(iFd, "r+");
+	 compress_struct = compress_open(iFd, "r+");
       else if ((Mode & WriteOnly) == WriteOnly)
-	 d->gz = gzdopen(iFd, "w");
+	 compress_struct = compress_open(iFd, "w");
       else
-	 d->gz = gzdopen(iFd, "r");
-      if (d->gz == NULL)
+	 compress_struct = compress_open(iFd, "r");
+      if (compress_struct == NULL)
 	 return false;
-      Flags |= Compressed;
-      return true;
-   }
+
+      if (false)
+	 /* dummy so that the rest can be 'else if's */;
+#ifdef HAVE_ZLIB
+      else if (compressor.Name == "gzip")
+	 d->gz = (gzFile) compress_struct;
 #endif
 #ifdef HAVE_BZ2
-   if (compressor.Name == "bzip2")
-   {
-      if (d->bz2 != NULL)
+      else if (compressor.Name == "bzip2")
+	 d->bz2 = (BZFILE*) compress_struct;
+#endif
+#ifdef HAVE_LZMA
+      else if (compressor.Name == "xz" || compressor.Name == "lzma")
       {
-	 BZ2_bzclose(d->bz2);
-	 d->bz2 = NULL;
+	 uint32_t const xzlevel = 6;
+	 uint64_t const memlimit = UINT64_MAX;
+	 if (d->lzma == NULL)
+	    d->lzma = new FileFdPrivate::LZMAFILE;
+	 d->lzma->file = (FILE*) compress_struct;
+	 d->lzma->stream = LZMA_STREAM_INIT;
+
+	 if ((Mode & ReadWrite) == ReadWrite)
+	    return FileFdError("ReadWrite mode is not supported for file %s", FileName.c_str());
+
+	 if ((Mode & WriteOnly) == WriteOnly)
+	 {
+	    if (compressor.Name == "xz")
+	    {
+	       if (lzma_easy_encoder(&d->lzma->stream, xzlevel, LZMA_CHECK_CRC32) != LZMA_OK)
+		  return false;
+	    }
+	    else
+	    {
+	       lzma_options_lzma options;
+	       lzma_lzma_preset(&options, xzlevel);
+	       if (lzma_alone_encoder(&d->lzma->stream, &options) != LZMA_OK)
+		  return false;
+	    }
+	    d->lzma->compressing = true;
+	 }
+	 else
+	 {
+	    if (compressor.Name == "xz")
+	    {
+	       if (lzma_auto_decoder(&d->lzma->stream, memlimit, 0) != LZMA_OK)
+		  return false;
+	    }
+	    else
+	    {
+	       if (lzma_alone_decoder(&d->lzma->stream, memlimit) != LZMA_OK)
+		  return false;
+	    }
+	    d->lzma->compressing = false;
+	 }
       }
-      if ((Mode & ReadWrite) == ReadWrite)
-	 d->bz2 = BZ2_bzdopen(iFd, "r+");
-      else if ((Mode & WriteOnly) == WriteOnly)
-	 d->bz2 = BZ2_bzdopen(iFd, "w");
-      else
-	 d->bz2 = BZ2_bzdopen(iFd, "r");
-      if (d->bz2 == NULL)
-	 return false;
+#endif
       Flags |= Compressed;
       return true;
    }
@@ -1218,7 +1355,7 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C
       }
       else
       {
-	 if (FileName.empty() == true)
+	 if (d->compressed_fd != -1)
 	    dup2(d->compressed_fd,STDIN_FILENO);
 	 dup2(Pipe[1],STDOUT_FILENO);
       }
@@ -1241,7 +1378,10 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C
 	 Args.push_back(a->c_str());
       if (Comp == false && FileName.empty() == false)
       {
-	 Args.push_back("--stdout");
+	 // commands not needing arguments, do not need to be told about using standard output
+	 // in reality, only testcases with tools like cat, rev, rot13, … are able to trigger this
+	 if (compressor.CompressArgs.empty() == false && compressor.UncompressArgs.empty() == false)
+	    Args.push_back("--stdout");
 	 if (TemporaryFileName.empty() == false)
 	    Args.push_back(TemporaryFileName.c_str());
 	 else
@@ -1287,24 +1427,68 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
    *((char *)To) = '\0';
    do
    {
+      if (false)
+	 /* dummy so that the rest can be 'else if's */;
 #ifdef HAVE_ZLIB
-      if (d != NULL && d->gz != NULL)
+      else if (d != NULL && d->gz != NULL)
 	 Res = gzread(d->gz,To,Size);
-      else
 #endif
 #ifdef HAVE_BZ2
-      if (d != NULL && d->bz2 != NULL)
+      else if (d != NULL && d->bz2 != NULL)
 	 Res = BZ2_bzread(d->bz2,To,Size);
-      else
 #endif
+#ifdef HAVE_LZMA
+      else if (d != NULL && d->lzma != NULL)
+      {
+	 if (d->lzma->eof == true)
+	    break;
+
+	 d->lzma->stream.next_out = (uint8_t *) To;
+	 d->lzma->stream.avail_out = Size;
+	 if (d->lzma->stream.avail_in == 0)
+	 {
+	    d->lzma->stream.next_in = d->lzma->buffer;
+	    d->lzma->stream.avail_in = fread(d->lzma->buffer, 1, sizeof(d->lzma->buffer)/sizeof(d->lzma->buffer[0]), d->lzma->file);
+	 }
+	 d->lzma->err = lzma_code(&d->lzma->stream, LZMA_RUN);
+	 if (d->lzma->err == LZMA_STREAM_END)
+	 {
+	    d->lzma->eof = true;
+	    Res = Size - d->lzma->stream.avail_out;
+	 }
+	 else if (d->lzma->err != LZMA_OK)
+	 {
+	    Res = -1;
+	    errno = 0;
+	 }
+	 else
+	 {
+	    Res = Size - d->lzma->stream.avail_out;
+	    if (Res == 0)
+	    {
+	       // lzma run was okay, but produced no output…
+	       Res = -1;
+	       errno = EINTR;
+	    }
+	 }
+      }
+#endif
+      else
          Res = read(iFd,To,Size);
 
       if (Res < 0)
       {
 	 if (errno == EINTR)
+	 {
+	    // trick the while-loop into running again
+	    Res = 1;
+	    errno = 0;
 	    continue;
+	 }
+	 if (false)
+	    /* dummy so that the rest can be 'else if's */;
 #ifdef HAVE_ZLIB
-	 if (d != NULL && d->gz != NULL)
+	 else if (d != NULL && d->gz != NULL)
 	 {
 	    int err;
 	    char const * const errmsg = gzerror(d->gz, &err);
@@ -1313,7 +1497,7 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 	 }
 #endif
 #ifdef HAVE_BZ2
-	 if (d != NULL && d->bz2 != NULL)
+	 else if (d != NULL && d->bz2 != NULL)
 	 {
 	    int err;
 	    char const * const errmsg = BZ2_bzerror(d->bz2, &err);
@@ -1321,6 +1505,10 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 	       return FileFdError("BZ2_bzread: %s (%d: %s)", _("Read error"), err, errmsg);
 	 }
 #endif
+#ifdef HAVE_LZMA
+	 else if (d != NULL && d->lzma != NULL)
+	    return FileFdError("lzma_read: %s (%d)", _("Read error"), d->lzma->err);
+#endif
 	 return FileFdErrno("read",_("Read error"));
       }
       
@@ -1384,23 +1572,45 @@ bool FileFd::Write(const void *From,unsigned long long Size)
    errno = 0;
    do
    {
+      if (false)
+	 /* dummy so that the rest can be 'else if's */;
 #ifdef HAVE_ZLIB
-      if (d != NULL && d->gz != NULL)
-         Res = gzwrite(d->gz,From,Size);
-      else
+      else if (d != NULL && d->gz != NULL)
+	 Res = gzwrite(d->gz,From,Size);
 #endif
 #ifdef HAVE_BZ2
-      if (d != NULL && d->bz2 != NULL)
-         Res = BZ2_bzwrite(d->bz2,(void*)From,Size);
-      else
+      else if (d != NULL && d->bz2 != NULL)
+	 Res = BZ2_bzwrite(d->bz2,(void*)From,Size);
 #endif
-         Res = write(iFd,From,Size);
+#ifdef HAVE_LZMA
+      else if (d != NULL && d->lzma != NULL)
+      {
+	 d->lzma->stream.next_in = (uint8_t *)From;
+	 d->lzma->stream.avail_in = Size;
+	 d->lzma->stream.next_out = d->lzma->buffer;
+	 d->lzma->stream.avail_out = sizeof(d->lzma->buffer)/sizeof(d->lzma->buffer[0]);
+	 d->lzma->err = lzma_code(&d->lzma->stream, LZMA_RUN);
+	 if (d->lzma->err != LZMA_OK)
+	    return false;
+	 size_t const n = sizeof(d->lzma->buffer)/sizeof(d->lzma->buffer[0]) - d->lzma->stream.avail_out;
+	 size_t const m = (n == 0) ? 0 : fwrite(d->lzma->buffer, 1, n, d->lzma->file);
+	 if (m != n)
+	    Res = -1;
+	 else
+	    Res = Size - d->lzma->stream.avail_in;
+      }
+#endif
+      else
+	 Res = write(iFd,From,Size);
+
       if (Res < 0 && errno == EINTR)
 	 continue;
       if (Res < 0)
       {
+	 if (false)
+	    /* dummy so that the rest can be 'else if's */;
 #ifdef HAVE_ZLIB
-	 if (d != NULL && d->gz != NULL)
+	 else if (d != NULL && d->gz != NULL)
 	 {
 	    int err;
 	    char const * const errmsg = gzerror(d->gz, &err);
@@ -1409,7 +1619,7 @@ bool FileFd::Write(const void *From,unsigned long long Size)
 	 }
 #endif
 #ifdef HAVE_BZ2
-	 if (d != NULL && d->bz2 != NULL)
+	 else if (d != NULL && d->bz2 != NULL)
 	 {
 	    int err;
 	    char const * const errmsg = BZ2_bzerror(d->bz2, &err);
@@ -1417,10 +1627,14 @@ bool FileFd::Write(const void *From,unsigned long long Size)
 	       return FileFdError("BZ2_bzwrite: %s (%d: %s)", _("Write error"), err, errmsg);
 	 }
 #endif
+#ifdef HAVE_LZMA
+	 else if (d != NULL && d->lzma != NULL)
+	    return FileFdErrno("lzma_fwrite", _("Write error"));
+#endif
 	 return FileFdErrno("write",_("Write error"));
       }
       
-      From = (char *)From + Res;
+      From = (char const *)From + Res;
       Size -= Res;
       if (d != NULL)
 	 d->seekpos += Res;
@@ -1444,7 +1658,7 @@ bool FileFd::Write(int Fd, const void *From, unsigned long long Size)
       if (Res < 0)
 	 return _error->Errno("write",_("Write error"));
 
-      From = (char *)From + Res;
+      From = (char const *)From + Res;
       Size -= Res;
    }
    while (Res > 0 && Size > 0);
@@ -1460,11 +1674,9 @@ bool FileFd::Write(int Fd, const void *From, unsigned long long Size)
 /* */
 bool FileFd::Seek(unsigned long long To)
 {
-   if (d != NULL && (d->pipe == true
-#ifdef HAVE_BZ2
-			|| d->bz2 != NULL
-#endif
-	))
+   Flags &= ~HitEof;
+
+   if (d != NULL && (d->pipe == true || d->InternalStream() == true))
    {
       // Our poor man seeking in pipes is costly, so try to avoid it
       unsigned long long seekpos = Tell();
@@ -1475,13 +1687,7 @@ bool FileFd::Seek(unsigned long long To)
 
       if ((d->openmode & ReadOnly) != ReadOnly)
 	 return FileFdError("Reopen is only implemented for read-only files!");
-#ifdef HAVE_BZ2
-     if (d->bz2 != NULL) 
-     {
-	BZ2_bzclose(d->bz2);
-	d->bz2 = NULL;
-     }
-#endif
+      d->InternalClose(FileName);
       if (iFd != -1)
 	 close(iFd);
       iFd = -1;
@@ -1527,13 +1733,8 @@ bool FileFd::Seek(unsigned long long To)
 /* */
 bool FileFd::Skip(unsigned long long Over)
 {
-   if (d != NULL && (d->pipe == true
-#ifdef HAVE_BZ2
-			|| d->bz2 != NULL
-#endif
-	))
+   if (d != NULL && (d->pipe == true || d->InternalStream() == true))
    {
-      d->seekpos += Over;
       char buffer[1024];
       while (Over != 0)
       {
@@ -1568,8 +1769,12 @@ bool FileFd::Truncate(unsigned long long To)
    // truncating /dev/null is always successful - as we get an error otherwise
    if (To == 0 && FileName == "/dev/null")
       return true;
-#if defined HAVE_ZLIB || defined HAVE_BZ2
-   if (d != NULL && (d->gz != NULL || d->bz2 != NULL))
+#if defined HAVE_ZLIB || defined HAVE_BZ2 || defined HAVE_LZMA
+   if (d != NULL && (d->InternalStream() == true
+#ifdef HAVE_ZLIB
+	    || d->gz != NULL
+#endif
+	    ))
       return FileFdError("Truncating compressed files is not implemented (%s)", FileName.c_str());
 #endif
    if (ftruncate(iFd,To) != 0)
@@ -1587,11 +1792,7 @@ unsigned long long FileFd::Tell()
    // seeking around, but not all users of FileFd use always Seek() and co
    // so d->seekpos isn't always true and we can just use it as a hint if
    // we have nothing else, but not always as an authority…
-   if (d != NULL && (d->pipe == true
-#ifdef HAVE_BZ2
-			|| d->bz2 != NULL
-#endif
-	))
+   if (d != NULL && (d->pipe == true || d->InternalStream() == true))
       return d->seekpos;
 
    off_t Res;
@@ -1666,11 +1867,7 @@ unsigned long long FileFd::Size()
 
    // for compressor pipes st_size is undefined and at 'best' zero,
    // so we 'read' the content and 'seek' back - see there
-   if (d != NULL && (d->pipe == true
-#ifdef HAVE_BZ2
-			|| (d->bz2 && size > 0)
-#endif
-	))
+   if (d != NULL && (d->pipe == true || (d->InternalStream() == true && size > 0)))
    {
       unsigned long long const oldSeek = Tell();
       char ignore[1000];
@@ -1701,19 +1898,13 @@ unsigned long long FileFd::Size()
 	  FileFdErrno("lseek","Unable to seek to end of gzipped file");
 	  return 0;
        }
-       size = 0;
+       uint32_t size = 0;
        if (read(iFd, &size, 4) != 4)
        {
 	  FileFdErrno("read","Unable to read original size of gzipped file");
 	  return 0;
        }
-
-#ifdef WORDS_BIGENDIAN
-       uint32_t tmp_size = size;
-       uint8_t const * const p = (uint8_t const * const) &tmp_size;
-       tmp_size = (p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0];
-       size = tmp_size;
-#endif
+       size = le32toh(size);
 
        if (lseek(iFd, oldPos, SEEK_SET) < 0)
        {
@@ -1813,7 +2004,13 @@ bool FileFd::FileFdError(const char *Description,...) {
 }
 									/*}}}*/
 
-gzFile FileFd::gzFd() { return (gzFile) d->gz; }
+APT_DEPRECATED gzFile FileFd::gzFd() {
+#ifdef HAVE_ZLIB
+   return d->gz;
+#else
+   return NULL;
+#endif
+}
 
 
 // Glob - wrapper around "glob()"                                      /*{{{*/
@@ -1861,3 +2058,14 @@ std::string GetTempDir()
 
    return string(tmpdir);
 }
+
+bool Rename(std::string From, std::string To)
+{
+   if (rename(From.c_str(),To.c_str()) != 0)
+   {
+      _error->Error(_("rename failed, %s (%s -> %s)."),strerror(errno),
+                    From.c_str(),To.c_str());
+      return false;
+   }   
+   return true;
+}
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 58a90e83b..c9c80af39 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -27,6 +27,7 @@
 #include <string>
 #include <vector>
 #include <set>
+#include <time.h>
 
 #include <zlib.h>
 
@@ -94,7 +95,7 @@ class FileFd
       And as the auto-conversation converts a 'unsigned long *' to a 'bool'
       instead of 'unsigned long long *' we need to provide this explicitely -
       otherwise applications magically start to fail… */
-   __deprecated bool Read(void *To,unsigned long long Size,unsigned long *Actual)
+   bool Read(void *To,unsigned long long Size,unsigned long *Actual) APT_DEPRECATED
    {
 	unsigned long long R;
 	bool const T = Read(To, Size, &R);
@@ -102,10 +103,10 @@ class FileFd
 	return T;
    }
 
-   bool Open(std::string FileName,unsigned int const Mode,CompressMode Compress,unsigned long const Perms = 0666);
-   bool Open(std::string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor,unsigned long const Perms = 0666);
-   inline bool Open(std::string const &FileName,unsigned int const Mode, unsigned long const Perms = 0666) {
-      return Open(FileName, Mode, None, Perms);
+   bool Open(std::string FileName,unsigned int const Mode,CompressMode Compress,unsigned long const AccessMode = 0666);
+   bool Open(std::string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor,unsigned long const AccessMode = 0666);
+   inline bool Open(std::string const &FileName,unsigned int const Mode, unsigned long const AccessMode = 0666) {
+      return Open(FileName, Mode, None, AccessMode);
    };
    bool OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compress, bool AutoClose=false);
    bool OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose=false);
@@ -118,7 +119,7 @@ class FileFd
    // Simple manipulators
    inline int Fd() {return iFd;};
    inline void Fd(int fd) { OpenDescriptor(fd, ReadWrite);};
-   __deprecated gzFile gzFd();
+   gzFile gzFd() APT_DEPRECATED APT_PURE;
 
    inline bool IsOpen() {return iFd >= 0;};
    inline bool Failed() {return (Flags & Fail) == Fail;};
@@ -128,13 +129,13 @@ class FileFd
    inline bool IsCompressed() {return (Flags & Compressed) == Compressed;};
    inline std::string &Name() {return FileName;};
    
-   FileFd(std::string FileName,unsigned int const Mode,unsigned long Perms = 0666) : iFd(-1), Flags(0), d(NULL)
+   FileFd(std::string FileName,unsigned int const Mode,unsigned long AccessMode = 0666) : iFd(-1), Flags(0), d(NULL)
    {
-      Open(FileName,Mode, None, Perms);
+      Open(FileName,Mode, None, AccessMode);
    };
-   FileFd(std::string FileName,unsigned int const Mode, CompressMode Compress, unsigned long Perms = 0666) : iFd(-1), Flags(0), d(NULL)
+   FileFd(std::string FileName,unsigned int const Mode, CompressMode Compress, unsigned long AccessMode = 0666) : iFd(-1), Flags(0), d(NULL)
    {
-      Open(FileName,Mode, Compress, Perms);
+      Open(FileName,Mode, Compress, AccessMode);
    };
    FileFd() : iFd(-1), Flags(AutoClose), d(NULL) {};
    FileFd(int const Fd, unsigned int const Mode = ReadWrite, CompressMode Compress = None) : iFd(-1), Flags(0), d(NULL)
@@ -149,11 +150,11 @@ class FileFd
 
    private:
    FileFdPrivate* d;
-   bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor);
+   APT_HIDDEN bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor);
 
    // private helpers to set Fail flag and call _error->Error
-   bool FileFdErrno(const char* Function, const char* Description,...) __like_printf(3) __cold;
-   bool FileFdError(const char* Description,...) __like_printf(2) __cold;
+   APT_HIDDEN bool FileFdErrno(const char* Function, const char* Description,...) APT_PRINTF(3) APT_COLD;
+   APT_HIDDEN bool FileFdError(const char* Description,...) APT_PRINTF(2) APT_COLD;
 };
 
 bool RunScripts(const char *Cnf);
@@ -161,9 +162,10 @@ bool CopyFile(FileFd &From,FileFd &To);
 int GetLock(std::string File,bool Errors = true);
 bool FileExists(std::string File);
 bool RealFileExists(std::string File);
-bool DirectoryExists(std::string const &Path) __attrib_const;
+bool DirectoryExists(std::string const &Path) APT_CONST;
 bool CreateDirectory(std::string const &Parent, std::string const &Path);
 time_t GetModificationTime(std::string const &Path);
+bool Rename(std::string From, std::string To);
 
 std::string GetTempDir();
 
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index 9de227062..f24dd9640 100644
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -2,21 +2,23 @@
 // Include Files							/*{{{*/
 #include<config.h>
 
+#include<apt-pkg/configuration.h>
+#include<apt-pkg/error.h>
+#include<apt-pkg/strutl.h>
+#include<apt-pkg/fileutl.h>
+#include<apt-pkg/gpgv.h>
+
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-
-#include<apt-pkg/configuration.h>
-#include<apt-pkg/error.h>
-#include<apt-pkg/strutl.h>
-#include<apt-pkg/fileutl.h>
-#include<apt-pkg/gpgv.h>
+#include <stddef.h>
+#include <iostream>
+#include <string>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h
index 1d79a52ac..f018893fd 100644
--- a/apt-pkg/contrib/gpgv.h
+++ b/apt-pkg/contrib/gpgv.h
@@ -9,17 +9,17 @@
 #ifndef CONTRIB_GPGV_H
 #define CONTRIB_GPGV_H
 
+#include <apt-pkg/macros.h>
+
 #include <string>
 #include <vector>
 
+#ifndef APT_10_CLEANER_HEADERS
 #include <apt-pkg/fileutl.h>
-
-#if __GNUC__ >= 4
-	#define APT_noreturn	__attribute__ ((noreturn))
-#else
-	#define APT_noreturn	/* no support */
 #endif
 
+class FileFd;
+
 /** \brief generates and run the command to verify a file with gpgv
  *
  * If File and FileSig specify the same file it is assumed that we
@@ -40,14 +40,12 @@
  * @param FileSig is the signature (detached or clear-signed)
  */
 void ExecGPGV(std::string const &File, std::string const &FileSig,
-      int const &statusfd, int fd[2]) APT_noreturn;
-inline void ExecGPGV(std::string const &File, std::string const &FileSig,
+      int const &statusfd, int fd[2]) APT_NORETURN;
+inline APT_NORETURN void ExecGPGV(std::string const &File, std::string const &FileSig,
       int const &statusfd = -1) {
    int fd[2];
    ExecGPGV(File, FileSig, statusfd, fd);
-};
-
-#undef APT_noreturn
+}
 
 /** \brief Split an inline signature into message and signature
  *
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 890573d9c..1fce0d75f 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -16,8 +16,12 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/macros.h>
+#include <apt-pkg/md5.h>
+#include <apt-pkg/sha1.h>
+#include <apt-pkg/sha2.h>
 
+#include <stddef.h>
+#include <algorithm>
 #include <unistd.h>
 #include <string>
 #include <iostream>
@@ -112,7 +116,7 @@ const char** HashString::SupportedHashes()
    return _SupportedHashes;
 }
 
-bool HashString::empty() const
+APT_PURE bool HashString::empty() const
 {
    return (Type.empty() || Hash.empty());
 }
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 0a8bcd259..5cd1af03b 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -17,17 +17,22 @@
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/sha2.h>
-#include <apt-pkg/fileutl.h>
 
-#include <algorithm>
-#include <vector>
 #include <cstring>
-
+#include <string>
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::min;
 using std::vector;
 #endif
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>
+#include <algorithm>
+#include <vector>
+#endif
+
+
+class FileFd;
 
 // helper class that contains hash function name
 // and hash
@@ -61,7 +66,7 @@ class HashString
    bool empty() const;
 
    // return the list of hashes we support
-   static const char** SupportedHashes();
+   static APT_CONST const char** SupportedHashes();
 };
 
 class Hashes
@@ -77,7 +82,7 @@ class Hashes
    {
       return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size) && SHA512.Add(Data,Size);
    };
-   inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
+   inline bool Add(const char *Data) {return Add((unsigned char const *)Data,strlen(Data));};
    inline bool AddFD(int const Fd,unsigned long long Size = 0)
    { return AddFD(Fd, Size, true, true, true, true); };
    bool AddFD(int const Fd, unsigned long long Size, bool const addMD5,
diff --git a/apt-pkg/contrib/hashsum.cc b/apt-pkg/contrib/hashsum.cc
index d02177724..25ccc187d 100644
--- a/apt-pkg/contrib/hashsum.cc
+++ b/apt-pkg/contrib/hashsum.cc
@@ -1,6 +1,9 @@
 // Cryptographic API Base
 #include <config.h>
 
+#include <apt-pkg/fileutl.h>
+
+#include <algorithm>
 #include <unistd.h>
 #include "hashsum_template.h"
 
diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h
index 9bf160b2b..869dc5cb7 100644
--- a/apt-pkg/contrib/hashsum_template.h
+++ b/apt-pkg/contrib/hashsum_template.h
@@ -10,36 +10,40 @@
 #ifndef APTPKG_HASHSUM_TEMPLATE_H
 #define APTPKG_HASHSUM_TEMPLATE_H
 
-#include <apt-pkg/fileutl.h>
 
 #include <string>
 #include <cstring>
-#include <algorithm>
-#include <stdint.h>
 
 #include <apt-pkg/strutl.h>
 
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>
+#include <algorithm>
+#include <stdint.h>
+#endif
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::min;
 #endif
 
+class FileFd;
+
 template<int N>
 class HashSumValue
 {
    unsigned char Sum[N/8];
-   
+
    public:
 
    // Accessors
    bool operator ==(const HashSumValue &rhs) const
    {
       return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0;
-   };
+   }
    bool operator !=(const HashSumValue &rhs) const
    {
       return memcmp(Sum,rhs.Sum,sizeof(Sum)) != 0;
-   };
+   }
 
    std::string Value() const
    {
@@ -49,7 +53,7 @@ class HashSumValue
       };
       char Result[((N/8)*2)+1];
       Result[(N/8)*2] = 0;
-      
+
       // Convert each char into two letters
       int J = 0;
       int I = 0;
@@ -59,31 +63,31 @@ class HashSumValue
          Result[I + 1] = Conv[Sum[J] & 0xF];
       }
       return std::string(Result);
-   };
-   
+   }
+
    inline void Value(unsigned char S[N/8])
    {
-      for (int I = 0; I != sizeof(Sum); I++) 
+      for (int I = 0; I != sizeof(Sum); ++I)
          S[I] = Sum[I];
-   };
+   }
 
-   inline operator std::string() const 
+   inline operator std::string() const
    {
       return Value();
-   };
+   }
 
-   bool Set(std::string Str) 
+   bool Set(std::string Str)
    {
       return Hex2Num(Str,Sum,sizeof(Sum));
-   };
+   }
 
-   inline void Set(unsigned char S[N/8]) 
+   inline void Set(unsigned char S[N/8])
    {
-      for (int I = 0; I != sizeof(Sum); I++) 
+      for (int I = 0; I != sizeof(Sum); ++I)
          Sum[I] = S[I];
-   };
+   }
 
-   HashSumValue(std::string Str) 
+   HashSumValue(std::string Str)
    {
          memset(Sum,0,sizeof(Sum));
          Set(Str);
@@ -99,17 +103,17 @@ class SummationImplementation
    public:
    virtual bool Add(const unsigned char *inbuf, unsigned long long inlen) = 0;
    inline bool Add(const char *inbuf, unsigned long long const inlen)
-   { return Add((unsigned char *)inbuf, inlen); };
+   { return Add((const unsigned char *)inbuf, inlen); }
 
    inline bool Add(const unsigned char *Data)
-   { return Add(Data, strlen((const char *)Data)); };
+   { return Add(Data, strlen((const char *)Data)); }
    inline bool Add(const char *Data)
-   { return Add((const unsigned char *)Data, strlen((const char *)Data)); };
+   { return Add((const unsigned char *)Data, strlen(Data)); }
 
    inline bool Add(const unsigned char *Beg, const unsigned char *End)
-   { return Add(Beg, End - Beg); };
+   { return Add(Beg, End - Beg); }
    inline bool Add(const char *Beg, const char *End)
-   { return Add((const unsigned char *)Beg, End - Beg); };
+   { return Add((const unsigned char *)Beg, End - Beg); }
 
    bool AddFD(int Fd, unsigned long long Size = 0);
    bool AddFD(FileFd &Fd, unsigned long long Size = 0);
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index e53d01b8f..2d6448e5e 100644
--- a/apt-pkg/contrib/macros.h
+++ b/apt-pkg/contrib/macros.h
@@ -54,37 +54,91 @@
 #define CLRFLAG(v,f)	((v) &=~FLAG(f))
 #define	CHKFLAG(v,f)	((v) &  FLAG(f) ? true : false)
 
-// some nice optional GNUC features
-#if __GNUC__ >= 3
-	#define __must_check	__attribute__ ((warn_unused_result))
-	#define __deprecated	__attribute__ ((deprecated))
-	#define __attrib_const	__attribute__ ((__const__))
-	/* likely() and unlikely() can be used to mark boolean expressions
-	   as (not) likely true which will help the compiler to optimise */
+#ifdef __GNUC__
+#define APT_GCC_VERSION (__GNUC__ << 8 | __GNUC_MINOR__)
+#else
+#define APT_GCC_VERSION 0
+#endif
+
+/* likely() and unlikely() can be used to mark boolean expressions
+   as (not) likely true which will help the compiler to optimise */
+#if APT_GCC_VERSION >= 0x0300
 	#define likely(x)	__builtin_expect (!!(x), 1)
 	#define unlikely(x)	__builtin_expect (!!(x), 0)
 #else
-	#define __must_check	/* no warn_unused_result */
-	#define __deprecated	/* no deprecated */
-	#define __attrib_const	/* no const attribute */
 	#define likely(x)	(x)
 	#define unlikely(x)	(x)
 #endif
 
+#if APT_GCC_VERSION >= 0x0300
+	#define APT_DEPRECATED	__attribute__ ((deprecated))
+	#define APT_CONST	__attribute__((const))
+	#define APT_PURE	__attribute__((pure))
+	#define APT_NORETURN	__attribute__((noreturn))
+	#define APT_PRINTF(n)	__attribute__((format(printf, n, n + 1)))
+#else
+	#define APT_DEPRECATED
+	#define APT_CONST
+	#define APT_PURE
+	#define APT_NORETURN
+	#define APT_PRINTF(n)
+#endif
+
+#if APT_GCC_VERSION > 0x0302
+	#define APT_NONNULL(...)	__attribute__((nonnull(__VA_ARGS__)))
+	#define APT_MUSTCHECK		__attribute__((warn_unused_result))
+#else
+	#define APT_NONNULL(...)
+	#define APT_REQRET
+#endif
+
+#if APT_GCC_VERSION >= 0x0400
+	#define APT_SENTINEL	__attribute__((sentinel))
+	#define APT_PUBLIC __attribute__ ((visibility ("default")))
+	#define APT_HIDDEN __attribute__ ((visibility ("hidden")))
+#else
+	#define APT_SENTINEL
+	#define APT_PUBLIC
+	#define APT_HIDDEN
+#endif
+
 // cold functions are unlikely() to be called
-#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4
-	#define __cold	__attribute__ ((__cold__))
-	#define __hot	__attribute__ ((__hot__))
+#if APT_GCC_VERSION >= 0x0403
+	#define APT_COLD	__attribute__ ((__cold__))
+	#define APT_HOT		__attribute__ ((__hot__))
 #else
-	#define __cold	/* no cold marker */
-	#define __hot	/* no hot marker */
+	#define APT_COLD
+	#define APT_HOT
 #endif
 
-#ifdef __GNUG__
-// Methods have a hidden this parameter that is visible to this attribute
+#ifndef APT_10_CLEANER_HEADERS
+#if APT_GCC_VERSION >= 0x0300
+	#define __must_check	__attribute__ ((warn_unused_result))
+	#define __deprecated	__attribute__ ((deprecated))
+	#define __attrib_const	__attribute__ ((__const__))
 	#define __like_printf(n)	__attribute__((format(printf, n, n + 1)))
 #else
+	#define __must_check	/* no warn_unused_result */
+	#define __deprecated	/* no deprecated */
+	#define __attrib_const	/* no const attribute */
 	#define __like_printf(n)	/* no like-printf */
 #endif
+#if APT_GCC_VERSION >= 0x0403
+	#define __cold	__attribute__ ((__cold__))
+	#define __hot	__attribute__ ((__hot__))
+#else
+	#define __cold	/* no cold marker */
+	#define __hot	/* no hot marker */
+#endif
+#endif
+
+// These lines are extracted by the makefiles and the buildsystem
+// Increasing MAJOR or MINOR results in the need of recompiling all
+// reverse-dependencies of libapt-pkg against the new SONAME.
+// Non-ABI-Breaks should only increase RELEASE number.
+// See also buildlib/libversion.mak
+#define APT_PKG_MAJOR 4
+#define APT_PKG_MINOR 12
+#define APT_PKG_RELEASE 0
 
 #endif
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 4351aeb22..b487a96f9 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -38,13 +38,9 @@
 #include <config.h>
 
 #include <apt-pkg/md5.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/macros.h>
 
+#include <stdint.h>
 #include <string.h>
-#include <unistd.h>
-#include <netinet/in.h>                          // For htonl
-#include <inttypes.h>
 									/*}}}*/
 
 // byteSwap - Swap bytes in a buffer					/*{{{*/
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 195455645..f4992c223 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -23,14 +23,15 @@
 #ifndef APTPKG_MD5_H
 #define APTPKG_MD5_H
 
-
-#include <string>
-#include <cstring>
-#include <algorithm>
 #include <stdint.h>
 
 #include "hashsum_template.h"
 
+#ifndef APT_10_CLEANER_HEADERS
+#include <string>
+#include <cstring>
+#include <algorithm>
+#endif
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::min;
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 51e8eb30f..b2a53a6cb 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -22,11 +22,11 @@
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/macros.h>
 
+#include <string>
 #include <sys/mman.h>
-#include <sys/stat.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <cstring>
@@ -198,7 +198,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
       {
 #ifdef _POSIX_SYNCHRONIZED_IO
 	 unsigned long long const PSize = sysconf(_SC_PAGESIZE);
-	 if (msync((char *)Base+(unsigned long long)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
+	 if (msync((char *)Base+(Start/PSize)*PSize, Stop - Start, MS_SYNC) < 0)
 	    return _error->Errno("msync", _("Unable to synchronize mmap"));
 #endif
       }
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index e61a82f8c..1e3778f45 100644
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -15,14 +15,13 @@
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/fileutl.h>
 
 #include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <stddef.h>
 #include <pwd.h>
 
 #include "netrc.h"
@@ -186,7 +185,7 @@ void maybe_add_auth (URI &Uri, string NetRCFile)
       // if host did not work, try Host+Path next, this will trigger
       // a lookup uri.startswith(host) in the netrc file parser (because
       // of the "/"
-      char *hostpath = strdup(string(Uri.Host+Uri.Path).c_str());
+      char *hostpath = strdup((Uri.Host + Uri.Path).c_str());
       if (hostpath && parsenetrc_string(hostpath, login, password, netrcfile) == 0)
       {
 	 if (_config->FindB("Debug::Acquire::netrc", false) == true)
diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h
index 7349126c4..b5b56f5d4 100644
--- a/apt-pkg/contrib/netrc.h
+++ b/apt-pkg/contrib/netrc.h
@@ -16,6 +16,8 @@
 
 #include <string>
 
+#include <apt-pkg/macros.h>
+
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/strutl.h>
 #endif
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 916e1d730..4ff4f181d 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -14,6 +14,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 
+#include <sys/time.h>
+#include <string>
 #include <iostream>
 #include <stdio.h>
 #include <cstring>
@@ -125,14 +127,14 @@ bool OpProgress::CheckChange(float Interval)
 // OpTextProgress::OpTextProgress - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-OpTextProgress::OpTextProgress(Configuration &Config) : 
-                               NoUpdate(false), NoDisplay(false), LastLen(0) 
+OpTextProgress::OpTextProgress(Configuration &Config) :
+                               NoUpdate(false), NoDisplay(false), LastLen(0)
 {
    if (Config.FindI("quiet",0) >= 1 || Config.FindB("quiet::NoUpdate", false) == true)
       NoUpdate = true;
    if (Config.FindI("quiet",0) >= 2)
       NoDisplay = true;
-};
+}
 									/*}}}*/
 // OpTextProgress::Done - Clean up the display				/*{{{*/
 // ---------------------------------------------------------------------
@@ -150,12 +152,12 @@ void OpTextProgress::Done()
       cout << endl;
       OldOp = string();
    }
-   
+
    if (NoUpdate == true && NoDisplay == false && OldOp.empty() == false)
    {
       OldOp = string();
-      cout << endl;   
-   }   
+      cout << endl;
+   }
 }
 									/*}}}*/
 // OpTextProgress::Update - Simple text spinner				/*{{{*/
diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index b5a6a2440..bf6bc6cb6 100644
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -32,12 +32,9 @@
 #include <config.h>
 
 #include <apt-pkg/sha1.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/macros.h>
 
+#include <stdint.h>
 #include <string.h>
-#include <unistd.h>
-#include <inttypes.h>
 									/*}}}*/
 
 // SHA1Transform - Alters an existing SHA-1 hash			/*{{{*/
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index a8d55eb13..5770c315a 100644
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -14,12 +14,13 @@
 #ifndef APTPKG_SHA1_H
 #define APTPKG_SHA1_H
 
+#include "hashsum_template.h"
+
+#ifndef APT_10_CLEANER_HEADERS
 #include <string>
 #include <cstring>
 #include <algorithm>
-
-#include "hashsum_template.h"
-
+#endif
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::min;
diff --git a/apt-pkg/contrib/sha2.h b/apt-pkg/contrib/sha2.h
index 8e0c99a1b..a25ad4d32 100644
--- a/apt-pkg/contrib/sha2.h
+++ b/apt-pkg/contrib/sha2.h
@@ -14,14 +14,18 @@
 #ifndef APTPKG_SHA2_H
 #define APTPKG_SHA2_H
 
-#include <string>
 #include <cstring>
-#include <algorithm>
-#include <stdint.h>
 
 #include "sha2_internal.h"
 #include "hashsum_template.h"
 
+#ifndef APT_10_CLEANER_HEADERS
+#include <string>
+#include <algorithm>
+#include <stdint.h>
+#endif
+
+
 typedef HashSumValue<512> SHA512SumValue;
 typedef HashSumValue<256> SHA256SumValue;
 
diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc
index bb2560252..131ff5beb 100644
--- a/apt-pkg/contrib/sha2_internal.cc
+++ b/apt-pkg/contrib/sha2_internal.cc
@@ -33,6 +33,7 @@
  */
 #include <config.h>
 
+#include <endian.h>
 #include <string.h>	/* memcpy()/memset() or bcopy()/bzero() */
 #include <assert.h>	/* assert() */
 #include "sha2_internal.h"
diff --git a/apt-pkg/contrib/sha2_internal.h b/apt-pkg/contrib/sha2_internal.h
index d9d429c92..1b82d965d 100644
--- a/apt-pkg/contrib/sha2_internal.h
+++ b/apt-pkg/contrib/sha2_internal.h
@@ -44,6 +44,7 @@
 
 #ifdef SHA2_USE_INTTYPES_H
 
+#include <stddef.h>
 #include <inttypes.h>
 
 #endif /* SHA2_USE_INTTYPES_H */
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index d4f53ea3a..2100ee47b 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -21,6 +21,11 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 
+#include <stddef.h>
+#include <stdlib.h>
+#include <time.h>
+#include <string>
+#include <vector>
 #include <ctype.h>
 #include <string.h>
 #include <sstream>
@@ -33,9 +38,9 @@
 #include <iconv.h>
 
 #include <apti18n.h>
-
-using namespace std;
 									/*}}}*/
+using namespace std;
+
 // Strip - Remove white space from the front and back of a string       /*{{{*/
 // ---------------------------------------------------------------------
 namespace APT {
@@ -153,7 +158,7 @@ char *_strrstrip(char *String)
    End++;
    *End = 0;
    return String;
-};
+}
 									/*}}}*/
 // strtabexpand - Converts tabs into 8 spaces				/*{{{*/
 // ---------------------------------------------------------------------
@@ -1130,9 +1135,11 @@ bool TokSplitString(char Tok,char *Input,char **List,
    also, but the advantage is that we have an iteratable vector */
 vector<string> VectorizeString(string const &haystack, char const &split)
 {
+   vector<string> exploded;
+   if (haystack.empty() == true)
+      return exploded;
    string::const_iterator start = haystack.begin();
    string::const_iterator end = start;
-   vector<string> exploded;
    do {
       for (; end != haystack.end() && *end != split; ++end);
       exploded.push_back(string(start, end));
@@ -1182,7 +1189,7 @@ unsigned long RegexChoice(RxChoiceList *Rxs,const char **ListBegin,
       R->Hit = false;
 
    unsigned long Hits = 0;
-   for (; ListBegin != ListEnd; ListBegin++)
+   for (; ListBegin < ListEnd; ++ListBegin)
    {
       // Check if the name is a regex
       const char *I;
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 8d746f10e..185cdc3fc 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -18,15 +18,18 @@
 
 
 #include <limits>
-#include <stdlib.h>
 #include <string>
 #include <cstring>
 #include <vector>
 #include <iostream>
 #include <time.h>
+#include <stddef.h>
 
 #include "macros.h"
 
+#ifndef APT_10_CLEANER_HEADERS
+#include <stdlib.h>
+#endif
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::vector;
@@ -37,8 +40,8 @@ namespace APT {
    namespace String {
       std::string Strip(const std::string &s);
       bool Endswith(const std::string &s, const std::string &ending);
-   };
-};
+   }
+}
 
 
 bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
@@ -60,9 +63,9 @@ std::string Base64Encode(const std::string &Str);
 std::string OutputInDepth(const unsigned long Depth, const char* Separator="  ");
 std::string URItoFileName(const std::string &URI);
 std::string TimeRFC1123(time_t Date);
-bool RFC1123StrToTime(const char* const str,time_t &time) __must_check;
-bool FTPMDTMStrToTime(const char* const str,time_t &time) __must_check;
-__deprecated bool StrToTime(const std::string &Val,time_t &Result);
+bool RFC1123StrToTime(const char* const str,time_t &time) APT_MUSTCHECK;
+bool FTPMDTMStrToTime(const char* const str,time_t &time) APT_MUSTCHECK;
+APT_DEPRECATED bool StrToTime(const std::string &Val,time_t &Result);
 std::string LookupTag(const std::string &Message,const char *Tag,const char *Default = 0);
 int StringToBool(const std::string &Text,int Default = -1);
 bool ReadMessages(int Fd, std::vector<std::string> &List);
@@ -76,7 +79,7 @@ bool TokSplitString(char Tok,char *Input,char **List,
 		    unsigned long ListMax);
 
 // split a given string by a char
-std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) __attrib_const;
+std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) APT_CONST;
 
 /* \brief Return a vector of strings from string "input" where "sep"
  * is used as the delimiter string.
@@ -94,56 +97,56 @@ std::vector<std::string> VectorizeString(std::string const &haystack, char const
  */
 std::vector<std::string> StringSplit(std::string const &input, 
                                      std::string const &sep, 
-                                     unsigned int maxsplit=std::numeric_limits<unsigned int>::max()) __attrib_const;
+                                     unsigned int maxsplit=std::numeric_limits<unsigned int>::max()) APT_CONST;
 
-void ioprintf(std::ostream &out,const char *format,...) __like_printf(2);
-void strprintf(std::string &out,const char *format,...) __like_printf(2);
-char *safe_snprintf(char *Buffer,char *End,const char *Format,...) __like_printf(3);
+void ioprintf(std::ostream &out,const char *format,...) APT_PRINTF(2);
+void strprintf(std::string &out,const char *format,...) APT_PRINTF(2);
+char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_PRINTF(3);
 bool CheckDomainList(const std::string &Host, const std::string &List);
-int tolower_ascii(int const c) __attrib_const __hot;
+int tolower_ascii(int const c) APT_CONST APT_HOT;
 std::string StripEpoch(const std::string &VerStr);
 
 #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(const std::string& A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \
-inline int name(const std::string& A,const std::string& B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \
-inline int name(const std::string& A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);};
+inline APT_PURE int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));} \
+inline APT_PURE int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));} \
+inline APT_PURE int name(const std::string& A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));} \
+inline APT_PURE int name(const std::string& A,const std::string& B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());} \
+inline APT_PURE int name(const std::string& A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);}
 
 #define APT_MKSTRCMP2(name,func) \
-inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \
-inline int name(const std::string& A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));}; \
-inline int name(const std::string& A,const std::string& B) {return func(A.begin(),A.end(),B.begin(),B.end());}; \
-inline int name(const std::string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);};
+inline APT_PURE int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));} \
+inline APT_PURE int name(const std::string& A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));} \
+inline APT_PURE int name(const std::string& A,const std::string& B) {return func(A.begin(),A.end(),B.begin(),B.end());} \
+inline APT_PURE int name(const std::string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);}
 
-int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
-int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
+int APT_PURE stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
+int APT_PURE stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
 
 /* We assume that GCC 3 indicates that libstdc++3 is in use too. In that
    case the definition of string::const_iterator is not the same as
    const char * and we need these extra functions */
 #if __GNUC__ >= 3
-int stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd,
+int APT_PURE stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd,
 	      const char *B,const char *BEnd);
-int stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd,
+int APT_PURE stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd,
 	      std::string::const_iterator B,std::string::const_iterator BEnd);
-int stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd,
+int APT_PURE stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd,
 		  const char *B,const char *BEnd);
-int stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd,
+int APT_PURE stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd,
                   std::string::const_iterator B,std::string::const_iterator BEnd);
 
-inline int stringcmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcmp(A,Aend,B,B+strlen(B));};
-inline int stringcasecmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcasecmp(A,Aend,B,B+strlen(B));};
+inline APT_PURE int stringcmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcmp(A,Aend,B,B+strlen(B));}
+inline APT_PURE int stringcasecmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcasecmp(A,Aend,B,B+strlen(B));}
 #endif
 
-APT_MKSTRCMP2(stringcmp,stringcmp);
-APT_MKSTRCMP2(stringcasecmp,stringcasecmp);
+APT_MKSTRCMP2(stringcmp,stringcmp)
+APT_MKSTRCMP2(stringcasecmp,stringcasecmp)
 
 // Return the length of a NULL-terminated string array
-size_t strv_length(const char **str_array);
+size_t APT_PURE strv_length(const char **str_array);
 
 
-inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);};
+inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);}
 
 class URI
 {
@@ -159,13 +162,13 @@ class URI
    unsigned int Port;
    
    operator std::string();
-   inline void operator =(const std::string &From) {CopyFrom(From);};
+   inline void operator =(const std::string &From) {CopyFrom(From);}
    inline bool empty() {return Access.empty();};
    static std::string SiteOnly(const std::string &URI);
    static std::string NoUserPassword(const std::string &URI);
    
-   URI(std::string Path) {CopyFrom(Path);};
-   URI() : Port(0) {};
+   URI(std::string Path) {CopyFrom(Path);}
+   URI() : Port(0) {}
 };
 
 struct SubstVar
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 909dfcf47..eee758b7a 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -15,7 +15,6 @@
 #include <apt-pkg/debsrcrecords.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/debrecords.h>
-#include <apt-pkg/sourcelist.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/error.h>
@@ -23,7 +22,18 @@
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/debmetaindex.h>
 #include <apt-pkg/gpgv.h>
-
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgcachegen.h>
+#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/srcrecords.h>
+
+#include <stdio.h>
+#include <iostream>
+#include <string>
 #include <sys/stat.h>
 									/*}}}*/
 
@@ -650,7 +660,7 @@ pkgCache::PkgFileIterator debStatusIndex::FindInCache(pkgCache &Cache) const
 // StatusIndex::Exists - Check if the index is available		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool debStatusIndex::Exists() const
+APT_CONST bool debStatusIndex::Exists() const
 {
    // Abort if the file does not exist.
    return true;
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 9e64d4476..017c69a0a 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -16,9 +16,17 @@
 #ifndef PKGLIB_DEBINDEXFILE_H
 #define PKGLIB_DEBINDEXFILE_H
 
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/srcrecords.h>
 
+#include <string>
+
+class OpProgress;
+class pkgAcquire;
+class pkgCacheGenerator;
 
-#include <apt-pkg/indexfile.h>
 
 class debStatusIndex : public pkgIndexFile
 {
@@ -30,10 +38,10 @@ class debStatusIndex : public pkgIndexFile
 
    public:
 
-   virtual const Type *GetType() const;
+   virtual const Type *GetType() const APT_CONST;
    
    // Interface for acquire
-   virtual std::string Describe(bool Short) const {return File;};
+   virtual std::string Describe(bool /*Short*/) const {return File;};
    
    // Interface for the Cache Generator
    virtual bool Exists() const;
@@ -63,7 +71,7 @@ class debPackagesIndex : public pkgIndexFile
    
    public:
    
-   virtual const Type *GetType() const;
+   virtual const Type *GetType() const APT_CONST;
 
    // Stuff for accessing files on remote items
    virtual std::string ArchiveInfo(pkgCache::VerIterator Ver) const;
@@ -102,7 +110,7 @@ class debTranslationsIndex : public pkgIndexFile
 
    public:
    
-   virtual const Type *GetType() const;
+   virtual const Type *GetType() const APT_CONST;
 
    // Interface for acquire
    virtual std::string Describe(bool Short) const;   
@@ -134,7 +142,7 @@ class debSourcesIndex : public pkgIndexFile
    
    public:
 
-   virtual const Type *GetType() const;
+   virtual const Type *GetType() const APT_CONST;
 
    // Stuff for accessing files on remote items
    virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record,
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index acdcc4554..a1bcfb710 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -21,8 +21,17 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/crc-16.h>
 #include <apt-pkg/md5.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/tagfile.h>
 #include <apt-pkg/macros.h>
 
+#include <stddef.h>
+#include <string.h>
+#include <algorithm>
+#include <string>
+#include <vector>
 #include <ctype.h>
 									/*}}}*/
 
@@ -34,7 +43,7 @@ static debListParser::WordList PrioList[] = {
    {"standard",pkgCache::State::Standard},
    {"optional",pkgCache::State::Optional},
    {"extra",pkgCache::State::Extra},
-   {}};
+   {NULL, 0}};
 
 // ListParser::debListParser - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
@@ -95,44 +104,49 @@ string debListParser::Version()
    return Section.FindS("Version");
 }
 									/*}}}*/
-// ListParser::NewVersion - Fill in the version structure		/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debListParser::NewVersion(pkgCache::VerIterator &Ver)
+unsigned char debListParser::ParseMultiArch(bool const showErrors)	/*{{{*/
 {
-   // Parse the section
-   Ver->Section = UniqFindTagWrite("Section");
-
-   // Parse multi-arch
+   unsigned char MA;
    string const MultiArch = Section.FindS("Multi-Arch");
    if (MultiArch.empty() == true)
-      Ver->MultiArch = pkgCache::Version::None;
+      MA = pkgCache::Version::None;
    else if (MultiArch == "same") {
-      // Parse multi-arch
       if (ArchitectureAll() == true)
       {
-	 /* Arch all packages can't be Multi-Arch: same */
-	 _error->Warning("Architecture: all package '%s' can't be Multi-Arch: same",
-			Section.FindS("Package").c_str());
-	 Ver->MultiArch = pkgCache::Version::None;
+	 if (showErrors == true)
+	    _error->Warning("Architecture: all package '%s' can't be Multi-Arch: same",
+		  Section.FindS("Package").c_str());
+	 MA = pkgCache::Version::None;
       }
       else
-	 Ver->MultiArch = pkgCache::Version::Same;
+	 MA = pkgCache::Version::Same;
    }
    else if (MultiArch == "foreign")
-      Ver->MultiArch = pkgCache::Version::Foreign;
+      MA = pkgCache::Version::Foreign;
    else if (MultiArch == "allowed")
-      Ver->MultiArch = pkgCache::Version::Allowed;
+      MA = pkgCache::Version::Allowed;
    else
    {
-      _error->Warning("Unknown Multi-Arch type '%s' for package '%s'",
-			MultiArch.c_str(), Section.FindS("Package").c_str());
-      Ver->MultiArch = pkgCache::Version::None;
+      if (showErrors == true)
+	 _error->Warning("Unknown Multi-Arch type '%s' for package '%s'",
+	       MultiArch.c_str(), Section.FindS("Package").c_str());
+      MA = pkgCache::Version::None;
    }
 
    if (ArchitectureAll() == true)
-      Ver->MultiArch |= pkgCache::Version::All;
+      MA |= pkgCache::Version::All;
 
+   return MA;
+}
+									/*}}}*/
+// ListParser::NewVersion - Fill in the version structure		/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool debListParser::NewVersion(pkgCache::VerIterator &Ver)
+{
+   // Parse the section
+   Ver->Section = UniqFindTagWrite("Section");
+   Ver->MultiArch = ParseMultiArch(true);
    // Archive Size
    Ver->Size = Section.FindULL("Size");
    // Unpacked Size (in K)
@@ -354,7 +368,7 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
                           {"hold",pkgCache::State::Hold},
                           {"deinstall",pkgCache::State::DeInstall},
                           {"purge",pkgCache::State::Purge},
-                          {}};
+                          {NULL, 0}};
    if (GrabWord(string(Start,I-Start),WantList,Pkg->SelectedState) == false)
       return _error->Error("Malformed 1st word in the Status line");
 
@@ -370,7 +384,7 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
                           {"reinstreq",pkgCache::State::ReInstReq},
                           {"hold",pkgCache::State::HoldInst},
                           {"hold-reinstreq",pkgCache::State::HoldReInstReq},
-                          {}};
+                          {NULL, 0}};
    if (GrabWord(string(Start,I-Start),FlagList,Pkg->InstState) == false)
       return _error->Error("Malformed 2nd word in the Status line");
 
@@ -392,7 +406,7 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
                             {"triggers-pending",pkgCache::State::TriggersPending},
                             {"post-inst-failed",pkgCache::State::HalfConfigured},
                             {"removal-failed",pkgCache::State::HalfInstalled},
-                            {}};
+                            {NULL, 0}};
    if (GrabWord(string(Start,I-Start),StatusList,Pkg->CurrentState) == false)
       return _error->Error("Malformed 3rd word in the Status line");
 
@@ -475,17 +489,30 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
 /* This parses the dependency elements out of a standard string in place,
    bit by bit. */
 const char *debListParser::ParseDepends(const char *Start,const char *Stop,
+               std::string &Package,std::string &Ver,unsigned int &Op)
+   { return ParseDepends(Start, Stop, Package, Ver, Op, false, true, false); }
+const char *debListParser::ParseDepends(const char *Start,const char *Stop,
+               std::string &Package,std::string &Ver,unsigned int &Op,
+               bool const &ParseArchFlags)
+   { return ParseDepends(Start, Stop, Package, Ver, Op, ParseArchFlags, true, false); }
+const char *debListParser::ParseDepends(const char *Start,const char *Stop,
+               std::string &Package,std::string &Ver,unsigned int &Op,
+               bool const &ParseArchFlags, bool const &StripMultiArch)
+   { return ParseDepends(Start, Stop, Package, Ver, Op, ParseArchFlags, StripMultiArch, false); }
+const char *debListParser::ParseDepends(const char *Start,const char *Stop,
 					string &Package,string &Ver,
 					unsigned int &Op, bool const &ParseArchFlags,
-					bool const &StripMultiArch)
+					bool const &StripMultiArch,
+					bool const &ParseRestrictionsList)
 {
    // Strip off leading space
-   for (;Start != Stop && isspace(*Start) != 0; Start++);
+   for (;Start != Stop && isspace(*Start) != 0; ++Start);
    
    // Parse off the package name
    const char *I = Start;
    for (;I != Stop && isspace(*I) == 0 && *I != '(' && *I != ')' &&
-	*I != ',' && *I != '|' && *I != '[' && *I != ']'; I++);
+	*I != ',' && *I != '|' && *I != '[' && *I != ']' &&
+	*I != '<' && *I != '>'; ++I);
    
    // Malformed, no '('
    if (I != Stop && *I == ')')
@@ -602,6 +629,76 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
       for (;I != Stop && isspace(*I) != 0; I++);
    }
 
+   if (ParseRestrictionsList == true)
+   {
+      // Parse a restrictions list
+      if (I != Stop && *I == '<')
+      {
+	 ++I;
+	 // malformed
+	 if (unlikely(I == Stop))
+	    return 0;
+
+	 std::vector<string> const profiles = APT::Configuration::getBuildProfiles();
+
+	 const char *End = I;
+	 bool Found = false;
+	 bool NegRestriction = false;
+	 while (I != Stop)
+	 {
+	    // look for whitespace or ending '>'
+	    for (;End != Stop && !isspace(*End) && *End != '>'; ++End);
+
+	    if (unlikely(End == Stop))
+	       return 0;
+
+	    if (*I == '!')
+	    {
+	       NegRestriction = true;
+	       ++I;
+	    }
+
+	    std::string restriction(I, End);
+
+	    std::string prefix = "profile.";
+	    // only support for "profile" prefix, ignore others
+	    if (restriction.size() > prefix.size() &&
+		  restriction.substr(0, prefix.size()) == prefix)
+	    {
+	       // get the name of the profile
+	       restriction = restriction.substr(prefix.size());
+
+	       if (restriction.empty() == false && profiles.empty() == false &&
+		     std::find(profiles.begin(), profiles.end(), restriction) != profiles.end())
+	       {
+		  Found = true;
+		  if (I[-1] != '!')
+		     NegRestriction = false;
+		  // we found a match, so fast-forward to the end of the wildcards
+		  for (; End != Stop && *End != '>'; ++End);
+	       }
+	    }
+
+	    if (*End++ == '>') {
+	       I = End;
+	       break;
+	    }
+
+	    I = End;
+	    for (;I != Stop && isspace(*I) != 0; I++);
+	 }
+
+	 if (NegRestriction == true)
+	    Found = !Found;
+
+	 if (Found == false)
+	    Package = ""; /* not for this restriction */
+      }
+
+      // Skip whitespace
+      for (;I != Stop && isspace(*I) != 0; I++);
+   }
+
    if (I != Stop && *I == '|')
       Op |= pkgCache::Dep::Or;
    
@@ -635,7 +732,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
       string Version;
       unsigned int Op;
 
-      Start = ParseDepends(Start, Stop, Package, Version, Op, false, false);
+      Start = ParseDepends(Start, Stop, Package, Version, Op, false, false, false);
       if (Start == 0)
 	 return _error->Error("Problem parsing dependency %s",Tag);
       size_t const found = Package.rfind(':');
@@ -841,3 +938,24 @@ unsigned char debListParser::GetPrio(string Str)
    return Out;
 }
 									/*}}}*/
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+bool debListParser::SameVersion(unsigned short const Hash,		/*{{{*/
+      pkgCache::VerIterator const &Ver)
+{
+   if (pkgCacheGenerator::ListParser::SameVersion(Hash, Ver) == false)
+      return false;
+   // status file has no (Download)Size, but all others are fair game
+   // status file is parsed last, so the first version we encounter is
+   // probably also the version we have downloaded
+   unsigned long long const Size = Section.FindULL("Size");
+   if (Size != 0 && Size != Ver->Size)
+      return false;
+   // available everywhere, but easier to check here than to include in VersionHash
+   unsigned char MultiArch = ParseMultiArch(false);
+   if (MultiArch != Ver->MultiArch)
+      return false;
+   // for all practical proposes (we can check): same version
+   return true;
+}
+									/*}}}*/
+#endif
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 386d291a2..baace79fe 100644
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -13,11 +13,19 @@
 
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/tagfile.h>
+#include <apt-pkg/md5.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/macros.h>
+
+#include <string>
+#include <vector>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/indexfile.h>
 #endif
 
+class FileFd;
+
 class debListParser : public pkgCacheGenerator::ListParser
 {
    public:
@@ -63,6 +71,9 @@ class debListParser : public pkgCacheGenerator::ListParser
    virtual std::string DescriptionLanguage();
    virtual MD5SumValue Description_md5();
    virtual unsigned short VersionHash();
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+   virtual bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);
+#endif
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
 			   pkgCache::VerIterator &Ver);
    virtual unsigned long Offset() {return iOffset;};
@@ -72,15 +83,27 @@ class debListParser : public pkgCacheGenerator::ListParser
    
    bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File,
 			std::string section);
-   
+
+   static const char *ParseDepends(const char *Start,const char *Stop,
+	 std::string &Package,std::string &Ver,unsigned int &Op);
    static const char *ParseDepends(const char *Start,const char *Stop,
-			    std::string &Package,std::string &Ver,unsigned int &Op,
-			    bool const &ParseArchFlags = false,
-			    bool const &StripMultiArch = true);
+	 std::string &Package,std::string &Ver,unsigned int &Op,
+	 bool const &ParseArchFlags);
+   static const char *ParseDepends(const char *Start,const char *Stop,
+	 std::string &Package,std::string &Ver,unsigned int &Op,
+	 bool const &ParseArchFlags, bool const &StripMultiArch);
+   static const char *ParseDepends(const char *Start,const char *Stop,
+	 std::string &Package,std::string &Ver,unsigned int &Op,
+	 bool const &ParseArchFlags, bool const &StripMultiArch,
+	 bool const &ParseRestrictionsList);
+
    static const char *ConvertRelation(const char *I,unsigned int &Op);
 
    debListParser(FileFd *File, std::string const &Arch = "");
    virtual ~debListParser() {};
+
+   private:
+   APT_HIDDEN unsigned char ParseMultiArch(bool const showErrors);
 };
 
 #endif
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 504877558..6fd12add8 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -9,8 +9,15 @@
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/sourcelist.h>
-#include <apt-pkg/error.h>
-
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/metaindex.h>
+
+#include <string.h>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 #include <set>
 #include <algorithm>
 
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index cef8d68f7..2286fa8b2 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -3,7 +3,7 @@
 #define PKGLIB_DEBMETAINDEX_H
 
 #include <apt-pkg/metaindex.h>
-#include <apt-pkg/init.h>
+#include <apt-pkg/macros.h>
 
 #include <map>
 #include <string>
@@ -12,6 +12,12 @@
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/sourcelist.h>
 #endif
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/init.h>
+#endif
+
+class pkgAcquire;
+class pkgIndexFile;
 
 class debReleaseIndex : public metaIndex {
    public:
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 184c07c33..6063db5a8 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -12,10 +12,16 @@
 
 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/strutl.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/tagfile.h>
 
+#include <string.h>
+#include <algorithm>
+#include <string>
+#include <vector>
 #include <langinfo.h>
 									/*}}}*/
 
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index b5e3bbdba..bdac6c90b 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -17,6 +17,9 @@
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgcache.h>
+
+#include <string>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/indexfile.h>
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index f5fb2da4a..615f0f57d 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -15,13 +15,20 @@
 #include <apt-pkg/debsrcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
-#include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/srcrecords.h>
+#include <apt-pkg/tagfile.h>
 #include <apt-pkg/hashes.h>
 
-using std::max;
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+#include <string>
+#include <vector>
 									/*}}}*/
 
+using std::max;
 using std::string;
 
 // SrcRecordParser::Binaries - Return the binaries field		/*{{{*/
@@ -58,7 +65,7 @@ const char **debSrcRecordParser::Binaries()
    } while (*bin != '\0');
    StaticBinList.push_back(NULL);
 
-   return (const char **) &StaticBinList[0];
+   return &StaticBinList[0];
 }
 									/*}}}*/
 // SrcRecordParser::BuildDepends - Return the Build-Depends information	/*{{{*/
@@ -91,7 +98,7 @@ bool debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDe
       while (1)
       {
          Start = debListParser::ParseDepends(Start, Stop, 
-		     rec.Package,rec.Version,rec.Op,true, StripMultiArch);
+		     rec.Package,rec.Version,rec.Op,true,StripMultiArch,true);
 	 
          if (Start == 0) 
             return _error->Error("Problem parsing dependency: %s", fields[I]);
@@ -158,7 +165,7 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
          // assign full hash string
          F.Hash = HashString(SourceHashFields[i].second, RawHash).toStr();
          // API compat hack 
-         if(SourceHashFields[i].second == "MD5Sum")
+         if(strcmp(SourceHashFields[i].second, "MD5Sum") == 0)
             F.MD5Hash = RawHash;
          
          // Parse the size and append the directory
diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index a8fb465bb..b65d1480b 100644
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -11,11 +11,16 @@
 #ifndef PKGLIB_DEBSRCRECORDS_H
 #define PKGLIB_DEBSRCRECORDS_H
 
-
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/fileutl.h>
 
+#include <stddef.h>
+#include <string>
+#include <vector>
+
+class pkgIndexFile;
+
 class debSrcRecordParser : public pkgSrcRecords::Parser
 {
    /** \brief dpointer placeholder (for later in case we need it) */
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index b95ff15df..142f3a6e6 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -19,7 +19,14 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <sys/types.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+#include <vector>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
@@ -195,7 +202,7 @@ bool debSystem::Initialize(Configuration &Cnf)
 // ---------------------------------------------------------------------
 /* The standard name for a deb is 'deb'.. There are no separate versions
    of .deb to worry about.. */
-bool debSystem::ArchiveSupported(const char *Type)
+APT_PURE bool debSystem::ArchiveSupported(const char *Type)
 {
    if (strcmp(Type,"deb") == 0)
       return true;
diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h
index 855123516..a945f68fb 100644
--- a/apt-pkg/deb/debsystem.h
+++ b/apt-pkg/deb/debsystem.h
@@ -12,11 +12,19 @@
 
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
+#include <vector>
+class Configuration;
+class pkgIndexFile;
+class pkgPackageManager;
 class debSystemPrivate;
-class debStatusIndex;
 class pkgDepCache;
 
+#ifndef APT_10_CLEANER_HEADERS
+class debStatusIndex;
+#endif
+
 class debSystem : public pkgSystem
 {
    // private d-pointer
diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index 74e2552ff..a5eacb7f5 100644
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -15,6 +15,8 @@
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/pkgcache.h>
 
+#include <string.h>
+#include <string>
 #include <stdlib.h>
 #include <ctype.h>
 									/*}}}*/
diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index f1d6f3cc5..434ff4a2e 100644
--- a/apt-pkg/deb/debversion.h
+++ b/apt-pkg/deb/debversion.h
@@ -12,26 +12,26 @@
 #ifndef PKGLIB_DEBVERSION_H
 #define PKGLIB_DEBVERSION_H
 
+#include <apt-pkg/version.h>
 
+#include <string>
 
-#include <apt-pkg/version.h>
-    
 class debVersioningSystem : public pkgVersioningSystem
-{     
+{
    public:
-   
+
    static int CmpFragment(const char *A, const char *AEnd, const char *B,
-			  const char *BEnd);
-   
+			  const char *BEnd) APT_PURE;
+
    // Compare versions..
    virtual int DoCmpVersion(const char *A,const char *Aend,
-			  const char *B,const char *Bend);
-   virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer);
-   virtual int DoCmpReleaseVer(const char *A,const char *Aend,
+			  const char *B,const char *Bend) APT_PURE;
+   virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) APT_PURE;
+   virtual APT_PURE int DoCmpReleaseVer(const char *A,const char *Aend,
 			     const char *B,const char *Bend)
    {
       return DoCmpVersion(A,Aend,B,Bend);
-   }   
+   }
    virtual std::string UpstreamVersion(const char *A);
 
    debVersioningSystem();
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index b975754b0..32ef343aa 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -10,41 +10,45 @@
 // Includes								/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/dpkgpm.h>
-#include <apt-pkg/error.h>
+#include <apt-pkg/cachefile.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
-#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/dpkgpm.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/cachefile.h>
-#include <apt-pkg/packagemanager.h>
 #include <apt-pkg/install-progress.h>
+#include <apt-pkg/packagemanager.h>
+#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
 
-#include <unistd.h>
-#include <stdlib.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <grp.h>
+#include <pty.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/stat.h>
-#include <sys/types.h>
+#include <sys/time.h>
 #include <sys/wait.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <string.h>
-#include <algorithm>
-#include <sstream>
-#include <map>
-#include <pwd.h>
-#include <grp.h>
-#include <iomanip>
-
 #include <termios.h>
+#include <time.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
-#include <pty.h>
-#include <stdio.h>
+#include <algorithm>
+#include <cstring>
+#include <iostream>
+#include <map>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -395,10 +399,14 @@ bool pkgDPkgPM::SendPkgsInfo(FILE * const F, unsigned int const &Version)
    that are due to be installed. */
 bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
 {
+   bool result = true;
+
    Configuration::Item const *Opts = _config->Tree(Cnf);
    if (Opts == 0 || Opts->Child == 0)
       return true;
    Opts = Opts->Child;
+
+   sighandler_t old_sigpipe = signal(SIGPIPE, SIG_IGN);
    
    unsigned int Count = 1;
    for (; Opts != 0; Opts = Opts->Next, Count++)
@@ -406,6 +414,10 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
       if (Opts->Value.empty() == true)
          continue;
 
+      if(_config->FindB("Debug::RunScripts", false) == true)
+         std::clog << "Running external script with list of all .deb file: '"
+                   << Opts->Value << "'" << std::endl;
+
       // Determine the protocol version
       string OptSec = Opts->Value;
       string::size_type Pos;
@@ -420,8 +432,10 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
       std::set<int> KeepFDs;
       MergeKeepFdsFromConfiguration(KeepFDs);
       int Pipes[2];
-      if (pipe(Pipes) != 0)
-	 return _error->Errno("pipe","Failed to create IPC pipe to subprocess");
+      if (pipe(Pipes) != 0) {
+         result = _error->Errno("pipe","Failed to create IPC pipe to subprocess");
+         break;
+      }
       if (InfoFD != (unsigned)Pipes[0])
 	 SetCloseExec(Pipes[0],true);
       else
@@ -455,8 +469,10 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
       }
       close(Pipes[0]);
       FILE *F = fdopen(Pipes[1],"w");
-      if (F == 0)
-	 return _error->Errno("fdopen","Faild to open new FD");
+      if (F == 0) {
+         result = _error->Errno("fdopen","Faild to open new FD");
+         break;
+      }
       
       // Feed it the filenames.
       if (Version <= 1)
@@ -484,11 +500,14 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
       fclose(F);
       
       // Clean up the sub process
-      if (ExecWait(Process,Opts->Value.c_str()) == false)
-	 return _error->Error("Failure running script %s",Opts->Value.c_str());
+      if (ExecWait(Process,Opts->Value.c_str()) == false) {
+	 result = _error->Error("Failure running script %s",Opts->Value.c_str());
+         break;
+      }
    }
+   signal(SIGPIPE, old_sigpipe);
 
-   return true;
+   return result;
 }
 									/*}}}*/
 // DPkgPM::DoStdin - Read stdin and pass to slave pty			/*{{{*/
@@ -1034,14 +1053,15 @@ void pkgDPkgPM::StartPtyMagic()
    }
 
    // setup the pty and stuff
-   struct	winsize win;
+   struct winsize win;
 
-   // if tcgetattr does not return zero there was a error
-   // and we do not do any pty magic
+   // if tcgetattr for both stdin/stdout returns 0 (no error)
+   // we do the pty magic
    _error->PushToStack();
-   if (tcgetattr(STDOUT_FILENO, &d->tt) == 0)
+   if (tcgetattr(STDIN_FILENO, &d->tt) == 0 &&
+       tcgetattr(STDOUT_FILENO, &d->tt) == 0)
    {
-       if (ioctl(1, TIOCGWINSZ, (char *)&win) < 0)
+       if (ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&win) < 0)
        {
            _error->Errno("ioctl", _("ioctl(TIOCGWINSZ) failed"));
        } else if (openpty(&d->master, &d->slave, NULL, &d->tt, &win) < 0)
@@ -1526,28 +1546,18 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress)
 	 // here but keep the loop going and just report it as a error
 	 // for later
 	 bool const stopOnError = _config->FindB("Dpkg::StopOnError",true);
-	 
-	 if(stopOnError)
-	    RunScripts("DPkg::Post-Invoke");
 
-	 if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) 
+	 if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV)
 	    strprintf(d->dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
 	 else if (WIFEXITED(Status) != 0)
 	    strprintf(d->dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
-	 else 
+	 else
 	    strprintf(d->dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
+	 _error->Error("%s", d->dpkg_error.c_str());
 
-	 if(d->dpkg_error.size() > 0)
-	    _error->Error("%s", d->dpkg_error.c_str());
-
-	 if(stopOnError) 
-	 {
-	    CloseLog();
-            StopPtyMagic();
-            d->progress->Stop();
-	    return false;
-	 }
-      }      
+	 if(stopOnError)
+	    break;
+      }
    }
    // dpkg is done at this point
    d->progress->Stop();
@@ -1578,10 +1588,10 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress)
    }
 
    Cache.writeStateFile(NULL);
-   return true;
+   return d->dpkg_error.empty();
 }
 
-void SigINT(int sig) {
+void SigINT(int /*sig*/) {
    pkgPackageManager::SigINTStop = true;
 }
 									/*}}}*/
@@ -1608,7 +1618,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
    string::size_type pos;
    FILE *report;
 
-   if (_config->FindB("Dpkg::ApportFailureReport", false) == false)
+   if (_config->FindB("Dpkg::ApportFailureReport", true) == false)
    {
       std::clog << "configured to not write apport reports" << std::endl;
       return;
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 02e12a6d9..859c74b46 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -11,11 +11,20 @@
 #define PKGLIB_DPKGPM_H
 
 #include <apt-pkg/packagemanager.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/macros.h>
+
 #include <vector>
 #include <map>
 #include <stdio.h>
-#include <apt-pkg/macros.h>
+#include <string>
+
+#ifndef APT_10_CLEANER_HEADERS
 #include <apt-pkg/init.h>
+#endif
+
+class pkgDepCache;
+namespace APT { namespace Progress { class PackageManager; } }
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::vector;
@@ -82,7 +91,7 @@ class pkgDPkgPM : public pkgPackageManager
 
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);
-   __deprecated bool SendV2Pkgs(FILE *F);
+   APT_DEPRECATED bool SendV2Pkgs(FILE *F);
    bool SendPkgsInfo(FILE * const F, unsigned int const &Version);
    void WriteHistoryTag(std::string const &tag, std::string value);
    std::string ExpandShortPackageName(pkgDepCache &Cache,
@@ -109,10 +118,10 @@ class pkgDPkgPM : public pkgPackageManager
    void DoDpkgStatusFd(int statusfd);
    void ProcessDpkgStatusLine(char *line);
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
-   void DoDpkgStatusFd(int statusfd, int unused) {
+   void DoDpkgStatusFd(int statusfd, int /*unused*/) {
       DoDpkgStatusFd(statusfd);
    }
-   void ProcessDpkgStatusLine(int unused, char *line) {
+   void ProcessDpkgStatusLine(int /*unused*/, char *line) {
       ProcessDpkgStatusLine(line);
    }
 #endif
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index a12e6963d..19a6e0d7e 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -11,20 +11,26 @@
 #include<config.h>
 
 #include <apt-pkg/depcache.h>
-#include <apt-pkg/version.h>
 #include <apt-pkg/versionmatch.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sptr.h>
-#include <apt-pkg/algorithms.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
-#include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/cacheset.h>
-
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <list>
+#include <string>
+#include <utility>
+#include <vector>
 #include <algorithm>
 #include <iostream>
 #include <sstream>
@@ -222,7 +228,7 @@ bool pkgDepCache::readStateFile(OpProgress *Prog)			/*{{{*/
    return true;
 }
 									/*}}}*/
-bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly)	/*{{{*/
+bool pkgDepCache::writeStateFile(OpProgress * /*prog*/, bool InstalledOnly)	/*{{{*/
 {
    bool const debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false);
    
@@ -868,7 +874,7 @@ bool pkgDepCache::IsDeleteOk(PkgIterator const &Pkg,bool rPurge,
    return IsDeleteOkProtectInstallRequests(Pkg, rPurge, Depth, FromUser);
 }
 bool pkgDepCache::IsDeleteOkProtectInstallRequests(PkgIterator const &Pkg,
-      bool const rPurge, unsigned long const Depth, bool const FromUser)
+      bool const /*rPurge*/, unsigned long const Depth, bool const FromUser)
 {
    if (FromUser == false && Pkg->CurrentVer == 0)
    {
@@ -889,7 +895,7 @@ bool pkgDepCache::IsDeleteOkProtectInstallRequests(PkgIterator const &Pkg,
    and prevents mode changes for packages on hold for example.
    If you want to check Mode specific stuff you can use the virtual public
    Is<Mode>Ok methods instead */
-char const* PrintMode(char const mode)
+static char const* PrintMode(char const mode)
 {
 	 switch (mode)
 	 {
@@ -1053,10 +1059,9 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
       return true;
    }
 
-   // check if we are allowed to install the package (if we haven't already)
-   if (P.Mode != ModeInstall || P.InstallVer != P.CandidateVer)
-      if (IsInstallOk(Pkg,AutoInst,Depth,FromUser) == false)
-	 return false;
+   // check if we are allowed to install the package
+   if (IsInstallOk(Pkg,AutoInst,Depth,FromUser) == false)
+      return false;
 
    ActionGroup group(*this);
    P.iFlags &= ~AutoKept;
@@ -1117,32 +1122,22 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	 continue;
 
       /* Check if this dep should be consider for install. If it is a user
-         defined important dep and we are installed a new package then 
+         defined important dep and we are installed a new package then
 	 it will be installed. Otherwise we only check for important
-         deps that have changed from the installed version
-      */
+         deps that have changed from the installed version */
       if (IsImportantDep(Start) == false)
 	 continue;
 
-      /* If we are in an or group locate the first or that can 
-         succeed. We have already cached this.. */
+      /* If we are in an or group locate the first or that can
+         succeed. We have already cached this… */
       for (; Ors > 1 && (DepState[Start->ID] & DepCVer) != DepCVer; --Ors)
 	 ++Start;
+
+      /* unsatisfiable dependency: IsInstallOkDependenciesSatisfiableByCandidates
+         would have prevented us to get here if not overridden, so just skip
+	 over the problem here as the frontend will know what it is doing */
       if (Ors == 1 && (DepState[Start->ID] &DepCVer) != DepCVer && Start.IsNegative() == false)
-      {
-	 if(DebugAutoInstall == true)
-	    std::clog << OutputInDepth(Depth) << Start << " can't be satisfied!" << std::endl;
-	 if (Start.IsCritical() == false)
-	    continue;
-	 // if the dependency was critical, we have absolutely no chance to install it,
-	 // so if it wasn't installed remove it again. If it was, discard the candidate
-	 // as the problemresolver will trip over it otherwise trying to install it (#735967)
-	 if (Pkg->CurrentVer == 0)
-	    MarkDelete(Pkg,false,Depth + 1, false);
-	 else
-	    SetCandidateVersion(Pkg.CurrentVer());
-	 return false;
-      }
+	 continue;
 
       /* Check if any ImportantDep() (but not Critical) were added
        * since we installed the package.  Also check for deps that
@@ -1294,14 +1289,20 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 bool pkgDepCache::IsInstallOk(PkgIterator const &Pkg,bool AutoInst,
 			      unsigned long Depth, bool FromUser)
 {
-   return IsInstallOkMultiArchSameVersionSynced(Pkg,AutoInst, Depth, FromUser);
+   return IsInstallOkMultiArchSameVersionSynced(Pkg,AutoInst, Depth, FromUser) &&
+      IsInstallOkDependenciesSatisfiableByCandidates(Pkg,AutoInst, Depth, FromUser);
 }
 bool pkgDepCache::IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg,
-      bool const AutoInst, unsigned long const Depth, bool const FromUser)
+      bool const /*AutoInst*/, unsigned long const Depth, bool const FromUser)
 {
    if (FromUser == true) // as always: user is always right
       return true;
 
+   // if we have checked before and it was okay, it will still be okay
+   if (PkgState[Pkg->ID].Mode == ModeInstall &&
+	 PkgState[Pkg->ID].InstallVer == PkgState[Pkg->ID].CandidateVer)
+      return true;
+
    // ignore packages with none-M-A:same candidates
    VerIterator const CandVer = PkgState[Pkg->ID].CandidateVerIter(*this);
    if (unlikely(CandVer.end() == true) || CandVer == Pkg.CurrentVer() ||
@@ -1334,6 +1335,53 @@ bool pkgDepCache::IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg,
 
    return true;
 }
+bool pkgDepCache::IsInstallOkDependenciesSatisfiableByCandidates(PkgIterator const &Pkg,
+      bool const AutoInst, unsigned long const Depth, bool const /*FromUser*/)
+{
+   if (AutoInst == false)
+      return true;
+
+   VerIterator const CandVer = PkgState[Pkg->ID].CandidateVerIter(*this);
+   if (unlikely(CandVer.end() == true) || CandVer == Pkg.CurrentVer())
+      return true;
+
+   for (DepIterator Dep = CandVer.DependsList(); Dep.end() != true;)
+   {
+      // Grok or groups
+      DepIterator Start = Dep;
+      bool Result = true;
+      unsigned Ors = 0;
+      for (bool LastOR = true; Dep.end() == false && LastOR == true; ++Dep, ++Ors)
+      {
+	 LastOR = (Dep->CompareOp & Dep::Or) == Dep::Or;
+
+	 if ((DepState[Dep->ID] & DepInstall) == DepInstall)
+	    Result = false;
+      }
+
+      if (Start.IsCritical() == false || Start.IsNegative() == true || Result == false)
+	 continue;
+
+      /* If we are in an or group locate the first or that can succeed.
+         We have already cached this… */
+      for (; Ors > 1 && (DepState[Start->ID] & DepCVer) != DepCVer; --Ors)
+	 ++Start;
+
+      if (Ors == 1 && (DepState[Start->ID] &DepCVer) != DepCVer)
+      {
+	 if (DebugAutoInstall == true)
+	    std::clog << OutputInDepth(Depth) << Start << " can't be satisfied!" << std::endl;
+
+	 // the dependency is critical, but can't be installed, so discard the candidate
+	 // as the problemresolver will trip over it otherwise trying to install it (#735967)
+	 if (Pkg->CurrentVer != 0)
+	    SetCandidateVersion(Pkg.CurrentVer());
+	 return false;
+      }
+   }
+
+   return true;
+}
 									/*}}}*/
 // DepCache::SetReInstall - Set the reinstallation flag			/*{{{*/
 // ---------------------------------------------------------------------
@@ -1685,10 +1733,10 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep)
 }
 									/*}}}*/
 // Policy::GetPriority - Get the priority of the package pin		/*{{{*/
-signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const &Pkg)
-{ return 0; };
-signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const &File)
-{ return 0; };
+APT_CONST signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const &/*Pkg*/)
+{ return 0; }
+APT_CONST signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const &/*File*/)
+{ return 0; }
 									/*}}}*/
 pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc()		/*{{{*/
 {
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index f6848f383..bec651279 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -40,18 +40,27 @@
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
+
+#include <stddef.h>
 
-#include <vector>
 #include <memory>
-#include <set>
 #include <list>
+#include <string>
+#include <utility>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/progress.h>
 #include <apt-pkg/error.h>
 #endif
+#ifndef APT_10_CLEANER_HEADERS
+#include <set>
+#include <vector>
+#endif
 
 class OpProgress;
+class pkgVersioningSystem;
 
 class pkgDepCache : protected pkgCache::Namespace
 {
@@ -61,7 +70,7 @@ class pkgDepCache : protected pkgCache::Namespace
    class InRootSetFunc
    {
    public:
-     virtual bool InRootSet(const pkgCache::PkgIterator &pkg) {return false;};
+     virtual bool InRootSet(const pkgCache::PkgIterator &/*pkg*/) {return false;};
      virtual ~InRootSetFunc() {};
    };
 
@@ -231,7 +240,7 @@ class pkgDepCache : protected pkgCache::Namespace
       unsigned char DepState;          // DepState Flags
 
       // Update of candidate version
-      const char *StripEpoch(const char *Ver);
+      const char *StripEpoch(const char *Ver) APT_PURE;
       void Update(PkgIterator Pkg,pkgCache &Cache);
       
       // Various test members for the current status of the package
@@ -381,8 +390,8 @@ class pkgDepCache : protected pkgCache::Namespace
    /** \brief Update the Marked and Garbage fields of all packages.
     *
     *  This routine is implicitly invoked after all state manipulators
-    *  and when an ActionGroup is destroyed.  It invokes #MarkRequired
-    *  and #Sweep to do its dirty work.
+    *  and when an ActionGroup is destroyed.  It invokes the private
+    *  MarkRequired() and Sweep() to do its dirty work.
     *
     *  \param rootFunc A predicate that returns \b true for packages
     *  that should be added to the root set.
@@ -465,7 +474,7 @@ class pkgDepCache : protected pkgCache::Namespace
     *
     *  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 MarkPurge should we purge instead of "only" remove?
     *  \param Depth     recursive deep of this Marker call
     *  \param FromUser  was the remove requested by the user?
     */
@@ -497,6 +506,8 @@ class pkgDepCache : protected pkgCache::Namespace
    // methods call by IsInstallOk
    bool IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg,
 	 bool const AutoInst, unsigned long const Depth, bool const FromUser);
+   bool IsInstallOkDependenciesSatisfiableByCandidates(PkgIterator const &Pkg,
+      bool const AutoInst, unsigned long const Depth, bool const FromUser);
 
    // methods call by IsDeleteOk
    bool IsDeleteOkProtectInstallRequests(PkgIterator const &Pkg,
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index e90598392..ee42267bc 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -11,16 +11,25 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/policy.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/progress.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/strutl.h>
 
-#include <limits>
+#include <ctype.h>
+#include <stddef.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
 #include <stdio.h>
-
+#include <iostream>
+#include <vector>
+#include <limits>
 #include <string>
+#include <list>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -44,7 +53,7 @@ bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress)
       for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver, ++p)
       {
 	 WriteScenarioVersion(Cache, output, Pkg, Ver);
-	 WriteScenarioDependency(Cache, output, Pkg, Ver);
+	 WriteScenarioDependency(output, Ver);
 	 fprintf(output, "\n");
 	 if (Progress != NULL && p % 100 == 0)
 	    Progress->Progress(p);
@@ -64,7 +73,7 @@ bool EDSP::WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
       for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
       {
 	 WriteScenarioVersion(Cache, output, Pkg, Ver);
-	 WriteScenarioLimitedDependency(Cache, output, Pkg, Ver, pkgset);
+	 WriteScenarioLimitedDependency(output, Ver, pkgset);
 	 fprintf(output, "\n");
 	 if (Progress != NULL && p % 100 == 0)
 	    Progress->Progress(p);
@@ -111,8 +120,7 @@ void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgI
 }
 									/*}}}*/
 // EDSP::WriteScenarioDependency					/*{{{*/
-void EDSP::WriteScenarioDependency(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg,
-				pkgCache::VerIterator const &Ver)
+void EDSP::WriteScenarioDependency( FILE* output, pkgCache::VerIterator const &Ver)
 {
    std::string dependencies[pkgCache::Dep::Enhances + 1];
    bool orGroup = false;
@@ -148,8 +156,7 @@ void EDSP::WriteScenarioDependency(pkgDepCache &Cache, FILE* output, pkgCache::P
 }
 									/*}}}*/
 // EDSP::WriteScenarioLimitedDependency					/*{{{*/
-void EDSP::WriteScenarioLimitedDependency(pkgDepCache &Cache, FILE* output,
-					  pkgCache::PkgIterator const &Pkg,
+void EDSP::WriteScenarioLimitedDependency(FILE* output,
 					  pkgCache::VerIterator const &Ver,
 					  APT::PackageSet const &pkgset)
 {
diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index fd4436f60..f3092d3c6 100644
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -9,8 +9,12 @@
 #ifndef PKGLIB_EDSP_H
 #define PKGLIB_EDSP_H
 
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheset.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
+
+#include <stdio.h>
 
 #include <list>
 #include <string>
@@ -29,17 +33,15 @@ class EDSP								/*{{{*/
 	static const char * const PrioMap[];
 	static const char * const DepMap[];
 
-	bool static ReadLine(int const input, std::string &line);
-	bool static StringToBool(char const *answer, bool const defValue);
+	APT_HIDDEN bool static ReadLine(int const input, std::string &line);
+	APT_HIDDEN bool static StringToBool(char const *answer, bool const defValue);
 
-	void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
+	APT_HIDDEN void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
 					 pkgCache::PkgIterator const &Pkg,
 					 pkgCache::VerIterator const &Ver);
-	void static WriteScenarioDependency(pkgDepCache &Cache, FILE* output,
-					    pkgCache::PkgIterator const &Pkg,
+	APT_HIDDEN void static WriteScenarioDependency(FILE* output,
 					    pkgCache::VerIterator const &Ver);
-	void static WriteScenarioLimitedDependency(pkgDepCache &Cache, FILE* output,
-						   pkgCache::PkgIterator const &Pkg,
+	APT_HIDDEN void static WriteScenarioLimitedDependency(FILE* output,
 						   pkgCache::VerIterator const &Ver,
 						   APT::PackageSet const &pkgset);
 public:
diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index 98ce4497a..10313fd61 100644
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -10,15 +10,20 @@
 
 #include <apt-pkg/edspindexfile.h>
 #include <apt-pkg/edsplistparser.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/progress.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/debindexfile.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgcachegen.h>
+#include <apt-pkg/pkgrecords.h>
 
-#include <sys/stat.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <string>
 									/*}}}*/
 
 // edspIndex::edspIndex - Constructor					/*{{{*/
@@ -63,7 +68,7 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 class edspIFType: public pkgIndexFile::Type
 {
    public:
-   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator File) const
+   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator) const
    {
       // we don't have a record parser for this type as the file is not presistent
       return NULL;
diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index de10f2d2f..609a2cde4 100644
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -9,11 +9,15 @@
 #define PKGLIB_EDSPINDEXFILE_H
 
 #include <apt-pkg/debindexfile.h>
+#include <string>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/indexfile.h>
 #endif
 
+class OpProgress;
+class pkgCacheGenerator;
+
 class edspIndex : public debStatusIndex
 {
    /** \brief dpointer placeholder (for later in case we need it) */
@@ -21,7 +25,7 @@ class edspIndex : public debStatusIndex
 
    public:
 
-   virtual const Type *GetType() const;
+   virtual const Type *GetType() const APT_CONST;
 
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
 
diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index bcfdb1017..212dc7840 100644
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -12,11 +12,13 @@
 #include <config.h>
 
 #include <apt-pkg/edsplistparser.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/strutl.h>
 #include <apt-pkg/md5.h>
-#include <apt-pkg/macros.h>
+#include <apt-pkg/deblistparser.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/tagfile.h>
+
+#include <string>
 									/*}}}*/
 
 // ListParser::edspListParser - Constructor				/*{{{*/
@@ -84,8 +86,8 @@ bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
 }
 									/*}}}*/
 // ListParser::LoadReleaseInfo - Load the release information		/*{{{*/
-bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
-				    FileFd &File, std::string component)
+APT_CONST bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator & /*FileI*/,
+				    FileFd & /*File*/, std::string /*component*/)
 {
    return true;
 }
diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h
index a7bf9de95..959fb587f 100644
--- a/apt-pkg/edsp/edsplistparser.h
+++ b/apt-pkg/edsp/edsplistparser.h
@@ -12,6 +12,10 @@
 #define PKGLIB_EDSPLISTPARSER_H
 
 #include <apt-pkg/deblistparser.h>
+#include <apt-pkg/md5.h>
+#include <apt-pkg/pkgcache.h>
+
+#include <string>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/pkgcachegen.h>
diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index aae969d9d..92edb8d77 100644
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -11,16 +11,17 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/edspsystem.h>
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/edspindexfile.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/error.h>
+#include <apt-pkg/edspsystem.h>
 #include <apt-pkg/fileutl.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <errno.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <stddef.h>
+#include <string>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -49,7 +50,7 @@ bool edspSystem::Lock()
 }
 									/*}}}*/
 // System::UnLock - Drop a lock						/*{{{*/
-bool edspSystem::UnLock(bool NoErrors)
+bool edspSystem::UnLock(bool /*NoErrors*/)
 {
    return true;
 }
@@ -58,7 +59,7 @@ bool edspSystem::UnLock(bool NoErrors)
 // ---------------------------------------------------------------------
 /* we can't use edsp input as input for real installations - just a
    simulation can work, but everything else will fail bigtime */
-pkgPackageManager *edspSystem::CreatePM(pkgDepCache *Cache) const
+pkgPackageManager *edspSystem::CreatePM(pkgDepCache * /*Cache*/) const
 {
    return NULL;
 }
@@ -81,7 +82,7 @@ bool edspSystem::Initialize(Configuration &Cnf)
 }
 									/*}}}*/
 // System::ArchiveSupported - Is a file format supported		/*{{{*/
-bool edspSystem::ArchiveSupported(const char *Type)
+bool edspSystem::ArchiveSupported(const char * /*Type*/)
 {
    return false;
 }
diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h
index ca703fa84..65e36d714 100644
--- a/apt-pkg/edsp/edspsystem.h
+++ b/apt-pkg/edsp/edspsystem.h
@@ -11,8 +11,17 @@
 #define PKGLIB_EDSPSYSTEM_H
 
 #include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgcache.h>
 
+#include <vector>
+
+class Configuration;
+class pkgDepCache;
+class pkgIndexFile;
+class pkgPackageManager;
 class edspIndex;
+
 class edspSystem : public pkgSystem
 {
    /** \brief dpointer placeholder (for later in case we need it) */
@@ -22,11 +31,11 @@ class edspSystem : public pkgSystem
 
    public:
 
-   virtual bool Lock();
-   virtual bool UnLock(bool NoErrors = false);
-   virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const;
+   virtual bool Lock() APT_CONST;
+   virtual bool UnLock(bool NoErrors = false) APT_CONST;
+   virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const APT_CONST;
    virtual bool Initialize(Configuration &Cnf);
-   virtual bool ArchiveSupported(const char *Type);
+   virtual bool ArchiveSupported(const char *Type) APT_CONST;
    virtual signed Score(Configuration const &Cnf);
    virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List);
    virtual bool FindIndex(pkgCache::PkgFileIterator File,
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 7694cb1dd..854ba1bd7 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -20,17 +20,17 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/indexrecords.h>
-#include <apt-pkg/md5.h>
 #include <apt-pkg/cdrom.h>
+#include <apt-pkg/gpgv.h>
+#include <apt-pkg/hashes.h>
 
 #include <iostream>
 #include <sstream>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "indexcopy.h"
 #include <apti18n.h>
@@ -65,7 +65,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
       for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
 	   c != compressor.end(); ++c)
       {
-	 if (stat(std::string(file + c->Extension).c_str(), &Buf) != 0)
+	 if (stat((file + c->Extension).c_str(), &Buf) != 0)
 	    continue;
 	 found = true;
 	 break;
@@ -160,7 +160,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
 	    
 	    // Get the size
 	    struct stat Buf;
-	    if (stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0 || 
+	    if (stat((CDROM + Prefix + File).c_str(),&Buf) != 0 || 
 		Buf.st_size == 0)
 	    {
 	       bool Mangled = false;
@@ -175,7 +175,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
 	       }
 	       
 	       if (Mangled == false ||
-		   stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0)
+		   stat((CDROM + Prefix + File).c_str(),&Buf) != 0)
 	       {
 		  if (Debug == true)
 		     clog << "Missed(2): " << OrigFile << endl;
@@ -286,7 +286,7 @@ bool IndexCopy::ReconstructPrefix(string &Prefix,string OrigPath,string CD,
    while (1)
    {
       struct stat Buf;
-      if (stat(string(CD + MyPrefix + File).c_str(),&Buf) != 0)
+      if (stat((CD + MyPrefix + File).c_str(),&Buf) != 0)
       {
 	 if (Debug == true)
 	    cout << "Failed, " << CD + MyPrefix + File << endl;
@@ -315,7 +315,7 @@ bool IndexCopy::ReconstructChop(unsigned long &Chop,string Dir,string File)
    while (1)
    {
       struct stat Buf;
-      if (stat(string(Dir + File).c_str(),&Buf) != 0)
+      if (stat((Dir + File).c_str(),&Buf) != 0)
       {
 	 File = ChopDirs(File,1);
 	 Depth++;
@@ -436,8 +436,8 @@ bool PackageCopy::GetFile(string &File,unsigned long long &Size)
 /* */
 bool PackageCopy::RewriteEntry(FILE *Target,string File)
 {
-   TFRewriteData Changes[] = {{"Filename",File.c_str()},
-                              {}};
+   TFRewriteData Changes[] = {{ "Filename", File.c_str(), NULL },
+                              { NULL, NULL, NULL }};
    
    if (TFRewrite(Target,*Section,TFRewritePackageOrder,Changes) == false)
       return false;
@@ -482,8 +482,8 @@ bool SourceCopy::GetFile(string &File,unsigned long long &Size)
 bool SourceCopy::RewriteEntry(FILE *Target,string File)
 {
    string Dir(File,0,File.rfind('/'));
-   TFRewriteData Changes[] = {{"Directory",Dir.c_str()},
-                              {}};
+   TFRewriteData Changes[] = {{ "Directory", Dir.c_str(), NULL },
+                              { NULL, NULL, NULL }};
    
    if (TFRewrite(Target,*Section,TFRewriteSourceOrder,Changes) == false)
       return false;
@@ -551,7 +551,7 @@ bool SigVerify::CopyMetaIndex(string CDROM, string CDName,		/*{{{*/
 }
 									/*}}}*/
 bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,	/*{{{*/
-			      vector<string> PkgList,vector<string> SrcList)
+			      vector<string> /*PkgList*/,vector<string> /*SrcList*/)
 {
    if (SigList.empty() == true)
       return true;
@@ -642,16 +642,14 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
 }
 									/*}}}*/
 // SigVerify::RunGPGV - deprecated wrapper calling ExecGPGV		/*{{{*/
-bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
+APT_NORETURN bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
       int const &statusfd, int fd[2]) {
    ExecGPGV(File, FileOut, statusfd, fd);
-   return false;
-};
-bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
+}
+APT_NORETURN bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
       int const &statusfd) {
    ExecGPGV(File, FileOut, statusfd);
-   return false;
-};
+}
 									/*}}}*/
 bool TranslationsCopy::CopyTranslations(string CDROM,string Name,	/*{{{*/
 				vector<string> &List, pkgCdromStatus *log)
@@ -676,7 +674,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,	/*{{{*/
       for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
 	   c != compressor.end(); ++c)
       {
-	 if (stat(std::string(file + c->Extension).c_str(), &Buf) != 0)
+	 if (stat((file + c->Extension).c_str(), &Buf) != 0)
 	    continue;
 	 found = true;
 	 break;
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index e6a07a887..43cdb3f0a 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -14,16 +14,18 @@
 #include <string>
 #include <stdio.h>
 
-#include <apt-pkg/gpgv.h>
 #include <apt-pkg/macros.h>
 
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/gpgv.h>
+class FileFd;
+#endif
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::vector;
 #endif
 
 class pkgTagSection;
-class FileFd;
 class indexRecords;
 class pkgCdromStatus;
 
@@ -99,9 +101,9 @@ class SigVerify								/*{{{*/
    bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::string> &SigList,
 		      std::vector<std::string> PkgList,std::vector<std::string> SrcList);
 
-   __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
+   APT_DEPRECATED static bool RunGPGV(std::string const &File, std::string const &FileOut,
 		       int const &statusfd, int fd[2]);
-   __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
+   APT_DEPRECATED static bool RunGPGV(std::string const &File, std::string const &FileOut,
 			      int const &statusfd = -1);
 };
 									/*}}}*/
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 642a750d4..89615cb41 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -13,7 +13,13 @@
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/srcrecords.h>
+#include <apt-pkg/macros.h>
 
+#include <string>
+#include <vector>
 #include <clocale>
 #include <cstring>
 									/*}}}*/
@@ -47,7 +53,7 @@ pkgIndexFile::Type *pkgIndexFile::Type::GetType(const char *Type)
 // IndexFile::ArchiveInfo - Stub					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator Ver) const
+std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator /*Ver*/) const
 {
    return std::string();
 }
@@ -63,8 +69,8 @@ pkgCache::PkgFileIterator pkgIndexFile::FindInCache(pkgCache &Cache) const
 // IndexFile::SourceIndex - Stub					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-std::string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record,
-				pkgSrcRecords::File const &File) const
+std::string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &/*Record*/,
+				pkgSrcRecords::File const &/*File*/) const
 {
    return std::string();
 }
@@ -82,7 +88,7 @@ bool pkgIndexFile::TranslationsAvailable() {
    is already done in getLanguages(). Note also that this check is
    rather bad (doesn't take three character like ast into account).
    TODO: Remove method with next API break */
-__attribute__ ((deprecated)) bool pkgIndexFile::CheckLanguageCode(const char *Lang)
+APT_DEPRECATED bool pkgIndexFile::CheckLanguageCode(const char *Lang)
 {
   if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_'))
     return true;
@@ -98,7 +104,7 @@ __attribute__ ((deprecated)) bool pkgIndexFile::CheckLanguageCode(const char *La
 /* As we have now possibly more than one LanguageCode this method is
    supersided by a) private classmembers or b) getLanguages().
    TODO: Remove method with next API break */
-__attribute__ ((deprecated)) std::string pkgIndexFile::LanguageCode() {
+APT_DEPRECATED std::string pkgIndexFile::LanguageCode() {
 	if (TranslationsAvailable() == false)
 		return "";
 	return APT::Configuration::getLanguages()[0];
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index a0096fa34..b5c9ac77e 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -22,18 +22,21 @@
 #ifndef PKGLIB_INDEXFILE_H
 #define PKGLIB_INDEXFILE_H
 
-
-#include <string>
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
 
+#include <string>
+
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 #endif
-
+#ifndef APT_10_CLEANER_HEADERS
 class pkgAcquire;
+#endif
+
 class pkgCacheGenerator;
 class OpProgress;
 
@@ -51,7 +54,7 @@ class pkgIndexFile
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;
-      static Type *GetType(const char *Type);
+      static Type *GetType(const char *Type) APT_PURE;
 
       const char *Label;
 
@@ -78,11 +81,11 @@ class pkgIndexFile
    virtual bool Exists() const = 0;
    virtual bool HasPackages() const = 0;
    virtual unsigned long Size() const = 0;
-   virtual bool Merge(pkgCacheGenerator &Gen, OpProgress* Prog) const { return false; };
-   __deprecated virtual bool Merge(pkgCacheGenerator &Gen, OpProgress &Prog) const
+   virtual bool Merge(pkgCacheGenerator &/*Gen*/, OpProgress* /*Prog*/) const { return false; };
+   APT_DEPRECATED virtual bool Merge(pkgCacheGenerator &Gen, OpProgress &Prog) const
       { return Merge(Gen, &Prog); };
-   virtual bool MergeFileProvides(pkgCacheGenerator &Gen,OpProgress* Prog) const {return true;};
-   __deprecated virtual bool MergeFileProvides(pkgCacheGenerator &Gen, OpProgress &Prog) const
+   virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const {return true;};
+   APT_DEPRECATED virtual bool MergeFileProvides(pkgCacheGenerator &Gen, OpProgress &Prog) const
       {return MergeFileProvides(Gen, &Prog);};
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index f8097c3c6..5353d1098 100644
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -14,41 +14,46 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/gpgv.h>
 
-#include <sys/stat.h>
+#include <stdlib.h>
+#include <time.h>
 #include <clocale>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
 
 using std::string;
 
-string indexRecords::GetDist() const
+APT_PURE string indexRecords::GetDist() const
 {
    return this->Dist;
 }
 
-string indexRecords::GetSuite() const
+APT_PURE string indexRecords::GetSuite() const
 {
    return this->Suite;
 }
 
-bool indexRecords::CheckDist(const string MaybeDist) const
+APT_PURE bool indexRecords::CheckDist(const string MaybeDist) const
 {
    return (this->Dist == MaybeDist
 	   || this->Suite == MaybeDist);
 }
 
-string indexRecords::GetExpectedDist() const
+APT_PURE string indexRecords::GetExpectedDist() const
 {
    return this->ExpectedDist;
 }
 
-time_t indexRecords::GetValidUntil() const
+APT_PURE time_t indexRecords::GetValidUntil() const
 {
    return this->ValidUntil;
 }
 
-const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
+APT_PURE const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
 {
    std::map<std::string, indexRecords::checkSum* >::const_iterator sum = Entries.find(MetaKey);
    if (sum == Entries.end())
@@ -56,7 +61,7 @@ const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
    return sum->second;
 }
 
-bool indexRecords::Exists(string const &MetaKey) const
+APT_PURE bool indexRecords::Exists(string const &MetaKey) const
 {
    return Entries.count(MetaKey) == 1;
 }
@@ -129,10 +134,10 @@ bool indexRecords::Load(const string Filename)				/*{{{*/
    // get the user settings for this archive and use what expires earlier
    int MaxAge = _config->FindI("Acquire::Max-ValidTime", 0);
    if (Label.empty() == false)
-      MaxAge = _config->FindI(string("Acquire::Max-ValidTime::" + Label).c_str(), MaxAge);
+      MaxAge = _config->FindI(("Acquire::Max-ValidTime::" + Label).c_str(), MaxAge);
    int MinAge = _config->FindI("Acquire::Min-ValidTime", 0);
    if (Label.empty() == false)
-      MinAge = _config->FindI(string("Acquire::Min-ValidTime::" + Label).c_str(), MinAge);
+      MinAge = _config->FindI(("Acquire::Min-ValidTime::" + Label).c_str(), MinAge);
 
    if(MaxAge == 0 &&
       (MinAge == 0 || ValidUntil == 0)) // No user settings, use the one from the Release file
diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index d003ec0fa..e31f889ad 100644
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -5,17 +5,19 @@
 #ifndef PKGLIB_INDEXRECORDS_H
 #define PKGLIB_INDEXRECORDS_H
 
-
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/hashes.h>
 
 #include <map>
 #include <vector>
 #include <ctime>
+#include <string>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/fileutl.h>
 #endif
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/pkgcache.h>
+#endif
 
 class indexRecords
 {
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 6ab5ec42d..241628632 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -15,9 +15,11 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/macros.h>
 
+#include <string.h>
+#include <string>
 #include <cstdlib>
-#include <sys/stat.h>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -84,6 +86,7 @@ bool pkgInitConfig(Configuration &Cnf)
    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$");
+   Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
 
    // Default cdrom mount point
    Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/");
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index 00d361560..d062392e3 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: init.h,v 1.9.2.2 2004/01/02 18:51:00 mdz Exp $
 /* ######################################################################
 
    Init - Initialize the package library
@@ -17,19 +16,13 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgsystem.h>
 #endif
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/macros.h>
+#endif
 
 class pkgSystem;
 class Configuration;
 
-// These lines are extracted by the makefiles and the buildsystem
-// Increasing MAJOR or MINOR results in the need of recompiling all
-// reverse-dependencies of libapt-pkg against the new SONAME.
-// Non-ABI-Breaks should only increase RELEASE number.
-// See also buildlib/libversion.mak
-#define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR 13
-#define APT_PKG_RELEASE 0
-    
 extern const char *pkgVersion;
 extern const char *pkgLibVersion;
 
diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc
index a3a4cc0e1..cf6c85912 100644
--- a/apt-pkg/install-progress.cc
+++ b/apt-pkg/install-progress.cc
@@ -1,17 +1,23 @@
+#include <config.h>
+
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/install-progress.h>
 
-#include <apti18n.h>
-
-#include <termios.h>
+#include <signal.h>
+#include <unistd.h>
+#include <iostream>
+#include <string>
+#include <vector>
 #include <sys/ioctl.h>
 #include <sstream>
 #include <fcntl.h>
 #include <algorithm>
 #include <stdio.h>
 
+#include <apti18n.h>
+
 namespace APT {
 namespace Progress {
 
@@ -41,10 +47,10 @@ PackageManager* PackageManagerProgressFactory()
    return progress;
 }
 
-bool PackageManager::StatusChanged(std::string PackageName, 
+bool PackageManager::StatusChanged(std::string /*PackageName*/,
                                    unsigned int StepsDone,
                                    unsigned int TotalSteps,
-                                   std::string HumanReadableAction)
+                                   std::string /*HumanReadableAction*/)
 {
    int reporting_steps = _config->FindI("DpkgPM::Reporting-Steps", 1);
    percentage = StepsDone/(float)TotalSteps * 100.0;
@@ -87,7 +93,7 @@ void PackageManagerProgressFd::StartDpkg()
    WriteToStatusFd(status.str());
 }
 
-void PackageManagerProgressFd::Stop()
+APT_CONST void PackageManagerProgressFd::Stop()
 {
 }
 
@@ -170,7 +176,7 @@ void PackageManagerProgressDeb822Fd::StartDpkg()
    WriteToStatusFd(status.str());
 }
 
-void PackageManagerProgressDeb822Fd::Stop()
+APT_CONST void PackageManagerProgressDeb822Fd::Stop()
 {
 }
 
@@ -246,17 +252,22 @@ void PackageManagerFancy::staticSIGWINCH(int signum)
       (*I)->HandleSIGWINCH(signum);
 }
 
-int PackageManagerFancy::GetNumberTerminalRows()
+PackageManagerFancy::TermSize
+PackageManagerFancy::GetTerminalSize()
 {
    struct winsize win;
+   PackageManagerFancy::TermSize s = { 0, 0 };
+
    // FIXME: get from "child_pty" instead?
    if(ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&win) != 0)
-      return -1;
+      return s;
 
    if(_config->FindB("Debug::InstallProgress::Fancy", false) == true)
-      std::cerr << "GetNumberTerminalRows: " << win.ws_row << std::endl;
-   
-   return win.ws_row;
+      std::cerr << "GetTerminalSize: " << win.ws_row << " x " << win.ws_col << std::endl;
+
+   s.rows = win.ws_row;
+   s.columns = win.ws_col;
+   return s;
 }
 
 void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)
@@ -264,6 +275,9 @@ void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)
      if(_config->FindB("Debug::InstallProgress::Fancy", false) == true)
         std::cerr << "SetupTerminalScrollArea: " << nr_rows << std::endl;
 
+     if (unlikely(nr_rows <= 1))
+	return;
+
      // scroll down a bit to avoid visual glitch when the screen
      // area shrinks by one row
      std::cout << "\n";
@@ -285,28 +299,30 @@ void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)
      // setup tty size to ensure xterm/linux console are working properly too
      // see bug #731738
      struct winsize win;
-     ioctl(child_pty, TIOCGWINSZ, (char *)&win);
-     win.ws_row = nr_rows - 1;
-     ioctl(child_pty, TIOCSWINSZ, (char *)&win);
+     if (ioctl(child_pty, TIOCGWINSZ, (char *)&win) != -1)
+     {
+	win.ws_row = nr_rows - 1;
+	ioctl(child_pty, TIOCSWINSZ, (char *)&win);
+     }
 }
 
 void PackageManagerFancy::HandleSIGWINCH(int)
 {
-   int nr_terminal_rows = GetNumberTerminalRows();
+   int const nr_terminal_rows = GetTerminalSize().rows;
    SetupTerminalScrollArea(nr_terminal_rows);
+   DrawStatusLine();
 }
 
 void PackageManagerFancy::Start(int a_child_pty)
 {
    child_pty = a_child_pty;
-   int nr_terminal_rows = GetNumberTerminalRows();
-   if (nr_terminal_rows > 0)
-      SetupTerminalScrollArea(nr_terminal_rows);
+   int const nr_terminal_rows = GetTerminalSize().rows;
+   SetupTerminalScrollArea(nr_terminal_rows);
 }
 
 void PackageManagerFancy::Stop()
 {
-   int nr_terminal_rows = GetNumberTerminalRows();
+   int const nr_terminal_rows = GetTerminalSize().rows;
    if (nr_terminal_rows > 0)
    {
       SetupTerminalScrollArea(nr_terminal_rows + 1);
@@ -318,6 +334,26 @@ void PackageManagerFancy::Stop()
    child_pty = -1;
 }
 
+std::string 
+PackageManagerFancy::GetTextProgressStr(float Percent, int OutputSize)
+{
+   std::string output;
+   int i;
+   
+   // should we raise a exception here instead?
+   if (Percent < 0.0 || Percent > 1.0 || OutputSize < 3)
+      return output;
+   
+   int BarSize = OutputSize - 2; // bar without the leading "[" and trailing "]"
+   output += "[";
+   for(i=0; i < BarSize*Percent; i++)
+      output += "#";
+   for (/*nothing*/; i < BarSize; i++)
+      output += ".";
+   output += "]";
+   return output;
+}
+
 bool PackageManagerFancy::StatusChanged(std::string PackageName, 
                                         unsigned int StepsDone,
                                         unsigned int TotalSteps,
@@ -327,27 +363,53 @@ bool PackageManagerFancy::StatusChanged(std::string PackageName,
           HumanReadableAction))
       return false;
 
-   int row = GetNumberTerminalRows();
+   return DrawStatusLine();
+}
+bool PackageManagerFancy::DrawStatusLine()
+{
+   PackageManagerFancy::TermSize const size = GetTerminalSize();
+   if (unlikely(size.rows < 1 || size.columns < 1))
+      return false;
+
+   static std::string save_cursor = "\033[s";
+   static std::string restore_cursor = "\033[u";
+
+   // green
+   static std::string set_bg_color = DeQuoteString(
+      _config->Find("Dpkg::Progress-Fancy::Progress-fg", "%1b[42m"));
+   // black
+   static std::string set_fg_color = DeQuoteString(
+      _config->Find("Dpkg::Progress-Fancy::Progress-bg", "%1b[30m"));
+
+   static std::string restore_bg =  "\033[49m";
+   static std::string restore_fg = "\033[39m";
 
-   static string save_cursor = "\033[s";
-   static string restore_cursor = "\033[u";
-   
-   static string set_bg_color = "\033[42m"; // green
-   static string set_fg_color = "\033[30m"; // black
-   
-   static string restore_bg =  "\033[49m";
-   static string restore_fg = "\033[39m";
-   
    std::cout << save_cursor
       // move cursor position to last row
-             << "\033[" << row << ";0f" 
+             << "\033[" << size.rows << ";0f" 
              << set_bg_color
              << set_fg_color
              << progress_str
-             << restore_cursor
              << restore_bg
              << restore_fg;
    std::flush(std::cout);
+
+   // draw text progress bar
+   if (_config->FindB("Dpkg::Progress-Fancy::Progress-Bar", true))
+   {
+      int padding = 4;
+      float progressbar_size = size.columns - padding - progress_str.size();
+      float current_percent = percentage / 100.0;
+      std::cout << " " 
+                << GetTextProgressStr(current_percent, progressbar_size)
+                << " ";
+      std::flush(std::cout);
+   }
+
+   // restore
+   std::cout << restore_cursor;
+   std::flush(std::cout);
+
    last_reported_progress = percentage;
 
    return true;
@@ -371,5 +433,5 @@ bool PackageManagerText::StatusChanged(std::string PackageName,
 
 
 
-}; // namespace progress
-}; // namespace apt
+} // namespace progress
+} // namespace apt
diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h
index 8a5b68a8f..5d1a20e9b 100644
--- a/apt-pkg/install-progress.h
+++ b/apt-pkg/install-progress.h
@@ -1,6 +1,8 @@
 #ifndef PKGLIB_IPROGRESS_H
 #define PKGLIB_IPROGRESS_H
 
+#include <apt-pkg/macros.h>
+
 #include <string>
 #include <unistd.h>
 #include <signal.h>
@@ -24,16 +26,16 @@ namespace Progress {
     int last_reported_progress;
 
  public:
-    PackageManager() 
+    PackageManager()
        : percentage(0.0), last_reported_progress(-1) {};
     virtual ~PackageManager() {};
 
     /* Global Start/Stop */
-    virtual void Start(int child_pty=-1) {};
+    virtual void Start(int /*child_pty*/=-1) {};
     virtual void Stop() {};
 
-    /* When dpkg is invoked (may happen multiple times for each 
-     * install/remove block 
+    /* When dpkg is invoked (may happen multiple times for each
+     * install/remove block
     */
     virtual void StartDpkg() {};
 
@@ -44,18 +46,18 @@ namespace Progress {
          return 500000;
     };
 
-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
-                               std::string HumanReadableAction) ;
-    virtual void Error(std::string PackageName,                                
-                       unsigned int StepsDone,
-                       unsigned int TotalSteps,
-                       std::string ErrorMessage) {};
-    virtual void ConffilePrompt(std::string PackageName,
-                                unsigned int StepsDone,
-                                unsigned int TotalSteps,
-                                std::string ConfMessage) {};
+                               std::string HumanReadableAction);
+    virtual void Error(std::string /*PackageName*/,
+                       unsigned int /*StepsDone*/,
+                       unsigned int /*TotalSteps*/,
+                       std::string /*ErrorMessage*/) {}
+    virtual void ConffilePrompt(std::string /*PackageName*/,
+                                unsigned int /*StepsDone*/,
+                                unsigned int /*TotalSteps*/,
+                                std::string /*ConfMessage*/) {}
  };
 
  class PackageManagerProgressFd : public PackageManager
@@ -72,11 +74,11 @@ namespace Progress {
     virtual void StartDpkg();
     virtual void Stop();
 
-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
-    virtual void Error(std::string PackageName,                                
+    virtual void Error(std::string PackageName,
                        unsigned int StepsDone,
                        unsigned int TotalSteps,
                           std::string ErrorMessage);
@@ -101,11 +103,11 @@ namespace Progress {
     virtual void StartDpkg();
     virtual void Stop();
 
-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
-    virtual void Error(std::string PackageName,                                
+    virtual void Error(std::string PackageName,
                        unsigned int StepsDone,
                        unsigned int TotalSteps,
                           std::string ErrorMessage);
@@ -120,12 +122,18 @@ namespace Progress {
  private:
     static void staticSIGWINCH(int);
     static std::vector<PackageManagerFancy*> instances;
+    APT_HIDDEN bool DrawStatusLine();
 
  protected:
     void SetupTerminalScrollArea(int nr_rows);
     void HandleSIGWINCH(int);
 
-    int GetNumberTerminalRows();
+    typedef struct {
+       int rows;
+       int columns;
+    } TermSize;
+    TermSize GetTerminalSize();
+
     sighandler_t old_SIGWINCH;
     int child_pty;
 
@@ -134,23 +142,27 @@ namespace Progress {
     ~PackageManagerFancy();
     virtual void Start(int child_pty=-1);
     virtual void Stop();
-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
+
+    // return a progress bar of the given size for the given progress 
+    // percent between 0.0 and 1.0 in the form "[####...]"
+    static std::string GetTextProgressStr(float percent, int OutputSize);
  };
 
  class PackageManagerText : public PackageManager
  {
  public:
-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
  };
 
 
-}; // namespace Progress
-}; // namespace APT
+} // namespace Progress
+} // namespace APT
 
 #endif
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index a90131f80..5603b51ed 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -11,6 +11,7 @@ include ../buildlib/defaults.mak
 
 # The library name and version (indirectly used from init.h)
 include ../buildlib/libversion.mak
+
 LIBRARY=apt-pkg
 MAJOR=$(LIBAPTPKG_MAJOR)
 MINOR=$(LIBAPTPKG_RELEASE)
@@ -21,52 +22,12 @@ endif
 ifeq ($(HAVE_BZ2),yes)
 SLIBS+= -lbz2
 endif
+ifeq ($(HAVE_LZMA),yes)
+SLIBS+= -llzma
+endif
 APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
 
-# Source code for the contributed non-core things
-SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
-         contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
-	 contrib/hashsum.cc contrib/md5.cc contrib/sha1.cc \
-	 contrib/sha2_internal.cc contrib/hashes.cc \
-	 contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \
-	 contrib/fileutl.cc contrib/gpgv.cc
-HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h netrc.h \
-	  md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha2.h sha256.h \
-	  sha2_internal.h hashes.h hashsum_template.h \
-	  macros.h weakptr.h gpgv.h
-
-# Source code for the core main library
-SOURCE+= pkgcache.cc version.cc depcache.cc \
-         orderlist.cc tagfile.cc sourcelist.cc packagemanager.cc \
-	 pkgrecords.cc algorithms.cc acquire.cc\
-	 acquire-worker.cc acquire-method.cc init.cc clean.cc \
-	 srcrecords.cc cachefile.cc versionmatch.cc policy.cc \
-	 pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \
-	 indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \
-	 aptconfiguration.cc cachefilter.cc cacheset.cc edsp.cc \
-	 install-progress.cc upgrade.cc update.cc
-HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \
-	  orderlist.h sourcelist.h packagemanager.h tagfile.h \
-	  init.h pkgcache.h version.h progress.h pkgrecords.h \
-	  acquire.h acquire-worker.h acquire-item.h acquire-method.h \
-	  clean.h srcrecords.h cachefile.h versionmatch.h policy.h \
-	  pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \
-	  vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \
-	  cachefilter.h cacheset.h edsp.h install-progress.h \
-	  upgrade.h update.h
-
-# Source code for the debian specific components
-# In theory the deb headers do not need to be exported..
-SOURCE+= deb/deblistparser.cc deb/debrecords.cc deb/dpkgpm.cc \
-         deb/debsrcrecords.cc deb/debversion.cc deb/debsystem.cc \
-	 deb/debindexfile.cc deb/debindexfile.cc deb/debmetaindex.cc
-HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \
-	  deblistparser.h debsystem.h debindexfile.h debmetaindex.h
-
-# Source code for the APT resolver interface specific components
-SOURCE+= edsp/edsplistparser.cc edsp/edspindexfile.cc edsp/edspsystem.cc
-HEADERS+= edsplistparser.h edspindexfile.h edspsystem.h
-
-HEADERS := $(addprefix apt-pkg/,$(HEADERS))
+SOURCE = $(wildcard *.cc */*.cc)
+HEADERS = $(addprefix apt-pkg/,$(notdir $(wildcard *.h */*.h)))
 
 include $(LIBRARY_H)
diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 18a90a29d..ffabaadbf 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -1,12 +1,19 @@
 #ifndef PKGLIB_METAINDEX_H
 #define PKGLIB_METAINDEX_H
 
-
-#include <string>
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/init.h>
 
+#include <stddef.h>
+
+#include <string>
+#include <vector>
+
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/pkgcache.h>
+class pkgCacheGenerator;
+class OpProgress;
+#endif
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>
@@ -15,8 +22,6 @@ using std::string;
 #endif
 
 class pkgAcquire;
-class pkgCacheGenerator;
-class OpProgress;
 
 class metaIndex
 {
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 21b5fc4e7..a1fcbcc98 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -68,10 +68,14 @@
 #include <apt-pkg/orderlist.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/version.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgcache.h>
 
+#include <stdlib.h>
+#include <string.h>
+#include <string>
 #include <iostream>
 									/*}}}*/
 
diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h
index a2d7b321b..b8bad81b3 100644
--- a/apt-pkg/orderlist.h
+++ b/apt-pkg/orderlist.h
@@ -16,10 +16,12 @@
 #ifndef PKGLIB_ORDERLIST_H
 #define PKGLIB_ORDERLIST_H
 
-
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
 
+#include <string>
+
 class pkgDepCache;
 class pkgOrderList : protected pkgCache::Namespace
 {
@@ -46,7 +48,7 @@ class pkgOrderList : protected pkgCache::Namespace
    bool Debug;
    
    // Main visit function
-   __deprecated bool VisitNode(PkgIterator Pkg) { return VisitNode(Pkg, "UNKNOWN"); };
+   APT_DEPRECATED bool VisitNode(PkgIterator Pkg) { return VisitNode(Pkg, "UNKNOWN"); };
    bool VisitNode(PkgIterator Pkg, char const* from);
    bool VisitDeps(DepFunc F,PkgIterator Pkg);
    bool VisitRDeps(DepFunc F,PkgIterator Pkg);
@@ -68,9 +70,9 @@ class pkgOrderList : protected pkgCache::Namespace
    
    // For pre sorting
    static pkgOrderList *Me;
-   static int OrderCompareA(const void *a, const void *b);
-   static int OrderCompareB(const void *a, const void *b);
-   int FileCmp(PkgIterator A,PkgIterator B);
+   static int OrderCompareA(const void *a, const void *b) APT_PURE;
+   static int OrderCompareB(const void *a, const void *b) APT_PURE;
+   int FileCmp(PkgIterator A,PkgIterator B) APT_PURE;
    
    public:
 
@@ -100,7 +102,7 @@ class pkgOrderList : protected pkgCache::Namespace
    inline void RmFlag(Package *Pkg,unsigned long F) {Flags[Pkg->ID] &= ~F;};
    // IsNow will return true if the Pkg has been not been either configured or unpacked
    inline bool IsNow(PkgIterator Pkg) {return (Flags[Pkg->ID] & (States & (~Removed))) == 0;};
-   bool IsMissing(PkgIterator Pkg);
+   bool IsMissing(PkgIterator Pkg) APT_PURE;
    void WipeFlags(unsigned long F);
    void SetFileList(std::string *FileList) {this->FileList = FileList;};
 
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 5f9a31264..5d6bc6bd2 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -13,7 +13,7 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/orderlist.h>
@@ -24,7 +24,14 @@
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/sptr.h>
-
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/strutl.h>
+
+#include <stddef.h>
+#include <list>
+#include <string>
 #include <iostream>
 
 #include <apti18n.h>
@@ -615,6 +622,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
         clog << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")";
       if (PkgLoop)
         clog << " (Only Perform PreUnpack Checks)";
+      if (Immediate)
+	 clog << " immediately";
       clog << endl;
    }
 
@@ -741,7 +750,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
 	       // See if the current version is conflicting
 	       if (ConflictPkg.CurrentVer() == Ver && List->IsNow(ConflictPkg))
 	       {
-		  clog << OutputInDepth(Depth) << Pkg.FullName() << " conflicts with " << ConflictPkg.FullName() << endl;
+		  if (Debug)
+		     clog << OutputInDepth(Depth) << Pkg.FullName() << " conflicts with " << ConflictPkg.FullName() << endl;
 		  /* If a loop is not present or has not yet been detected, attempt to unpack packages
 		     to resolve this conflict. If there is a loop present, remove packages to resolve this conflict */
 		  if (List->IsFlag(ConflictPkg,pkgOrderList::Loop) == false)
@@ -955,21 +965,14 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); ++I)
    {
       PkgIterator Pkg(Cache,*I);
-      
+
       if (List->IsNow(Pkg) == false)
       {
-         if (!List->IsFlag(Pkg,pkgOrderList::Configured) && !NoImmConfigure) {
-            if (SmartConfigure(Pkg, 0) == false && Debug)
-               _error->Warning("Internal Error, Could not configure %s",Pkg.FullName().c_str());
-            // FIXME: The above warning message might need changing
-         } else {
-	    if (Debug == true)
-	       clog << "Skipping already done " << Pkg.FullName() << endl;
-	 }
+	 if (Debug == true)
+	    clog << "Skipping already done " << Pkg.FullName() << endl;
 	 continue;
-	 
       }
-      
+
       if (List->IsMissing(Pkg) == true)
       {
 	 if (Debug == true)
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 853b9bac8..344ed9192 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -23,15 +23,17 @@
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
-#include <apt-pkg/macros.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/install-progress.h>
 #include <apt-pkg/init.h>
+#include <apt-pkg/macros.h>
 
 #include <string>
-#include <iostream>
 #include <set>
 
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/install-progress.h>
+#include <iostream>
+#endif
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/depcache.h>
 using std::string;
@@ -73,7 +75,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    bool CreateOrderList();
    
    // Analysis helpers
-   bool DepAlwaysTrue(DepIterator D);
+   bool DepAlwaysTrue(DepIterator D) APT_PURE;
    
    // Install helpers
    bool ConfigureAll();
@@ -89,9 +91,9 @@ class pkgPackageManager : protected pkgCache::Namespace
    virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
    virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
-   virtual bool Go(APT::Progress::PackageManager *progress) {return true;};
+   virtual bool Go(APT::Progress::PackageManager * /*progress*/) {return true;};
 #else
-   virtual bool Go(int statusFd=-1) {return true;};
+   virtual bool Go(int /*statusFd*/=-1) {return true;};
 #endif
 
    virtual void Reset() {};
@@ -109,7 +111,7 @@ class pkgPackageManager : protected pkgCache::Namespace
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
    OrderResult DoInstall(APT::Progress::PackageManager *progress);
    // compat
-   __deprecated OrderResult DoInstall(int statusFd=-1);
+   APT_DEPRECATED OrderResult DoInstall(int statusFd=-1);
 #else
    OrderResult DoInstall(int statusFd=-1);
 #endif
@@ -124,7 +126,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    // stuff that needs to be done after the fork
    OrderResult DoInstallPostFork(APT::Progress::PackageManager *progress);
    // compat
-   __deprecated OrderResult DoInstallPostFork(int statusFd=-1);
+   APT_DEPRECATED OrderResult DoInstallPostFork(int statusFd=-1);
 #else
    OrderResult DoInstallPostFork(int statusFd=-1);
 #endif
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 80493c37b..5088712a2 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -29,12 +29,15 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/mmap.h>
 #include <apt-pkg/macros.h>
 
+#include <stddef.h>
+#include <string.h>
+#include <ostream>
+#include <vector>
 #include <string>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <ctype.h>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -52,7 +55,11 @@ pkgCache::Header::Header()
    /* Whenever the structures change the major version should be bumped,
       whenever the generator changes the minor version should be bumped. */
    MajorVersion = 9;
-   MinorVersion = 0;
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+   MinorVersion = 2;
+#else
+   MinorVersion = 1;
+#endif
    Dirty = false;
    
    HeaderSz = sizeof(pkgCache::Header);
@@ -414,7 +421,7 @@ pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const
 // GrpIterator::operator ++ - Postfix incr				/*{{{*/
 // ---------------------------------------------------------------------
 /* This will advance to the next logical group in the hash table. */
-void pkgCache::GrpIterator::operator ++(int) 
+void pkgCache::GrpIterator::operator ++(int)
 {
    // Follow the current links
    if (S != Owner->GrpP)
@@ -426,12 +433,12 @@ void pkgCache::GrpIterator::operator ++(int)
       HashIndex++;
       S = Owner->GrpP + Owner->HeaderP->GrpHashTable[HashIndex];
    }
-};
+}
 									/*}}}*/
 // PkgIterator::operator ++ - Postfix incr				/*{{{*/
 // ---------------------------------------------------------------------
 /* This will advance to the next logical package in the hash table. */
-void pkgCache::PkgIterator::operator ++(int) 
+void pkgCache::PkgIterator::operator ++(int)
 {
    // Follow the current links
    if (S != Owner->PkgP)
@@ -443,7 +450,7 @@ void pkgCache::PkgIterator::operator ++(int)
       HashIndex++;
       S = Owner->PkgP + Owner->HeaderP->PkgHashTable[HashIndex];
    }
-};
+}
 									/*}}}*/
 // PkgIterator::State - Check the State of the package			/*{{{*/
 // ---------------------------------------------------------------------
@@ -475,26 +482,26 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
 // ---------------------------------------------------------------------
 /* Return string representing of the candidate version. */
 const char *
-pkgCache::PkgIterator::CandVersion() const 
+pkgCache::PkgIterator::CandVersion() const
 {
   //TargetVer is empty, so don't use it.
   VerIterator version = 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 
+pkgCache::PkgIterator::CurVersion() const
 {
   VerIterator version = CurrentVer();
   if (version.IsGood())
     return CurrentVer().VerStr();
   return 0;
-};
+}
 									/*}}}*/
 // ostream operator to handle string representation of a package	/*{{{*/
 // ---------------------------------------------------------------------
@@ -695,7 +702,7 @@ void pkgCache::DepIterator::GlobOr(DepIterator &Start,DepIterator &End)
 // ---------------------------------------------------------------------
 /* Deps like self-conflicts should be ignored as well as implicit conflicts
    on virtual packages. */
-bool pkgCache::DepIterator::IsIgnorable(PkgIterator const &Pkg) const
+bool pkgCache::DepIterator::IsIgnorable(PkgIterator const &/*Pkg*/) const
 {
    if (IsNegative() == false)
       return false;
@@ -978,7 +985,7 @@ string pkgCache::PkgFileIterator::RelStr()
 									/*}}}*/
 // VerIterator::TranslatedDescription - Return the a DescIter for locale/*{{{*/
 // ---------------------------------------------------------------------
-/* return a DescIter for the current locale or the default if none is 
+/* return a DescIter for the current locale or the default if none is
  * found
  */
 pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const
@@ -1012,7 +1019,7 @@ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const
       if (strcmp(Desc.LanguageCode(), "") == 0)
 	 return Desc;
    return DescriptionList();
-};
+}
 
 									/*}}}*/
 // PrvIterator::IsMultiArchImplicit - added by the cache generation	/*{{{*/
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 7c01258f1..151de7d25 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -74,9 +74,11 @@
 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/macros.h>
+
 #include <string>
 #include <time.h>
-#include <apt-pkg/mmap.h>
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
@@ -156,8 +158,8 @@ class pkgCache								/*{{{*/
    std::string CacheFile;
    MMap &Map;
 
-   unsigned long sHash(const std::string &S) const;
-   unsigned long sHash(const char *S) const;
+   unsigned long sHash(const std::string &S) const APT_PURE;
+   unsigned long sHash(const char *S) const APT_PURE;
    
    public:
    
@@ -176,13 +178,13 @@ class pkgCache								/*{{{*/
    char *StrP;
 
    virtual bool ReMap(bool const &Errorchecks = true);
-   inline bool Sync() {return Map.Sync();};
-   inline MMap &GetMap() {return Map;};
-   inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();};
+   inline bool Sync() {return Map.Sync();}
+   inline MMap &GetMap() {return Map;}
+   inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();}
       
    // String hashing function (512 range)
-   inline unsigned long Hash(const std::string &S) const {return sHash(S);};
-   inline unsigned long Hash(const char *S) const {return sHash(S);};
+   inline unsigned long Hash(const std::string &S) const {return sHash(S);}
+   inline unsigned long Hash(const char *S) const {return sHash(S);}
 
    // Useful transformation things
    const char *Priority(unsigned char Priority);
@@ -192,7 +194,7 @@ class pkgCache								/*{{{*/
    PkgIterator FindPkg(const std::string &Name);
    PkgIterator FindPkg(const std::string &Name, const std::string &Arch);
 
-   Header &Head() {return *HeaderP;};
+   Header &Head() {return *HeaderP;}
    inline GrpIterator GrpBegin();
    inline GrpIterator GrpEnd();
    inline PkgIterator PkgBegin();
@@ -200,19 +202,19 @@ class pkgCache								/*{{{*/
    inline PkgFileIterator FileBegin();
    inline PkgFileIterator FileEnd();
 
-   inline bool MultiArchCache() const { return MultiArchEnabled; };
-   inline char const * const NativeArch() const;
+   inline bool MultiArchCache() const { return MultiArchEnabled; }
+   inline char const * NativeArch();
 
    // Make me a function
    pkgVersioningSystem *VS;
    
    // Converters
-   static const char *CompTypeDeb(unsigned char Comp);
-   static const char *CompType(unsigned char Comp);
+   static const char *CompTypeDeb(unsigned char Comp) APT_CONST;
+   static const char *CompType(unsigned char Comp) APT_CONST;
    static const char *DepType(unsigned char Dep);
    
    pkgCache(MMap *Map,bool DoMap = true);
-   virtual ~pkgCache() {};
+   virtual ~pkgCache() {}
 
 private:
    bool MultiArchEnabled;
@@ -318,7 +320,7 @@ struct pkgCache::Header
    /** \brief Size of the complete cache file */
    unsigned long  CacheFileSize;
 
-   bool CheckSizes(Header &Against) const;
+   bool CheckSizes(Header &Against) const APT_PURE;
    Header();
 };
 									/*}}}*/
@@ -451,7 +453,7 @@ struct pkgCache::PackageFile
    /** \brief Modification time for the file */
    time_t mtime;
 
-   /* @TODO document PackageFile::Flags */
+   /** @TODO document PackageFile::Flags */
    unsigned long Flags;
 
    // Linked list
@@ -474,7 +476,7 @@ struct pkgCache::VerFile
    map_ptrloc NextFile;       // PkgVerFile
    /** \brief position in the package file */
    map_ptrloc Offset;         // File offset
-   /* @TODO document pkgCache::VerFile::Size */
+   /** @TODO document pkgCache::VerFile::Size */
    unsigned long Size;
 };
 									/*}}}*/
@@ -488,7 +490,7 @@ struct pkgCache::DescFile
    map_ptrloc NextFile;       // PkgVerFile
    /** \brief position in the file */
    map_ptrloc Offset;         // File offset
-   /* @TODO document pkgCache::DescFile::Size */
+   /** @TODO document pkgCache::DescFile::Size */
    unsigned long Size;
 };
 									/*}}}*/
@@ -571,7 +573,7 @@ struct pkgCache::Description
        and to check that the Translation is up-to-date. */
    map_ptrloc md5sum;            // StringItem
 
-   /* @TODO document pkgCache::Description::FileList */
+   /** @TODO document pkgCache::Description::FileList */
    map_ptrloc FileList;          // DescFile
    /** \brief next translation for this description */
    map_ptrloc NextDesc;          // Description
@@ -661,27 +663,27 @@ struct pkgCache::StringItem
 									/*}}}*/
 
 
-inline char const * const pkgCache::NativeArch() const
-	{ return StrP + HeaderP->Architecture; };
+inline char const * pkgCache::NativeArch()
+	{ return StrP + HeaderP->Architecture; }
 
 #include <apt-pkg/cacheiterators.h>
 
-inline pkgCache::GrpIterator pkgCache::GrpBegin() 
-       {return GrpIterator(*this);};
-inline pkgCache::GrpIterator pkgCache::GrpEnd() 
-       {return GrpIterator(*this,GrpP);};
-inline pkgCache::PkgIterator pkgCache::PkgBegin() 
-       {return PkgIterator(*this);};
-inline pkgCache::PkgIterator pkgCache::PkgEnd() 
-       {return PkgIterator(*this,PkgP);};
+inline pkgCache::GrpIterator pkgCache::GrpBegin()
+       {return GrpIterator(*this);}
+inline pkgCache::GrpIterator pkgCache::GrpEnd()
+       {return GrpIterator(*this,GrpP);}
+inline pkgCache::PkgIterator pkgCache::PkgBegin()
+       {return PkgIterator(*this);}
+inline pkgCache::PkgIterator pkgCache::PkgEnd()
+       {return PkgIterator(*this,PkgP);}
 inline pkgCache::PkgFileIterator pkgCache::FileBegin()
-       {return PkgFileIterator(*this,PkgFileP + HeaderP->FileList);};
+       {return PkgFileIterator(*this,PkgFileP + HeaderP->FileList);}
 inline pkgCache::PkgFileIterator pkgCache::FileEnd()
-       {return PkgFileIterator(*this,PkgFileP);};
+       {return PkgFileIterator(*this,PkgFileP);}
 
 // Oh I wish for Real Name Space Support
 class pkgCache::Namespace						/*{{{*/
-{   
+{
    public:
    typedef pkgCache::GrpIterator GrpIterator;
    typedef pkgCache::PkgIterator PkgIterator;
@@ -690,7 +692,7 @@ class pkgCache::Namespace						/*{{{*/
    typedef pkgCache::DepIterator DepIterator;
    typedef pkgCache::PrvIterator PrvIterator;
    typedef pkgCache::PkgFileIterator PkgFileIterator;
-   typedef pkgCache::VerFileIterator VerFileIterator;   
+   typedef pkgCache::VerFileIterator VerFileIterator;
    typedef pkgCache::Version Version;
    typedef pkgCache::Description Description;
    typedef pkgCache::Package Package;
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 7ce7aba7b..810f0b022 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -18,20 +18,26 @@
 #include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/macros.h>
-#include <apt-pkg/tagfile.h>
 #include <apt-pkg/metaindex.h>
 #include <apt-pkg/fileutl.h>
-
+#include <apt-pkg/hashsum_template.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/md5.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <stddef.h>
+#include <string.h>
+#include <iostream>
+#include <string>
 #include <vector>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -118,11 +124,11 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newM
 
    Cache.ReMap(false);
 
-   CurrentFile += (pkgCache::PackageFile*) newMap - (pkgCache::PackageFile*) oldMap;
+   CurrentFile += (pkgCache::PackageFile const * const) newMap - (pkgCache::PackageFile const * const) oldMap;
 
    for (size_t i = 0; i < _count(UniqHash); ++i)
       if (UniqHash[i] != 0)
-	 UniqHash[i] += (pkgCache::StringItem*) newMap - (pkgCache::StringItem*) oldMap;
+	 UniqHash[i] += (pkgCache::StringItem const * const) newMap - (pkgCache::StringItem const * const) oldMap;
 
    for (std::vector<pkgCache::GrpIterator*>::const_iterator i = Dynamic<pkgCache::GrpIterator>::toReMap.begin();
 	i != Dynamic<pkgCache::GrpIterator>::toReMap.end(); ++i)
@@ -350,7 +356,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
    map_ptrloc *LastVer = &Pkg->VersionList;
    void const * oldMap = Map.Data();
 
-   unsigned long const Hash = List.VersionHash();
+   unsigned short const Hash = List.VersionHash();
    if (Ver.end() == false)
    {
       /* We know the list is sorted so we use that fact in the search.
@@ -363,7 +369,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
 	 if (Res > 0)
 	    break;
 	 // Versionstrings are equal - is hash also equal?
-	 if (Res == 0 && Ver->Hash == Hash)
+	 if (Res == 0 && List.SameVersion(Hash, Ver) == true)
 	    break;
 	 // proceed with the next till we have either the right
 	 // or we found another version (which will be lower)
@@ -398,7 +404,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
 			   Pkg.Name(), "NewVersion", 1);
 
    if (oldMap != Map.Data())
-	 LastVer += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
+	 LastVer += (map_ptrloc const * const) Map.Data() - (map_ptrloc const * const) oldMap;
    *LastVer = verindex;
 
    if (unlikely(List.NewVersion(Ver) == false))
@@ -552,12 +558,12 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
       if (Counter % 100 == 0 && Progress != 0)
 	 Progress->Progress(List.Offset());
 
-      unsigned long Hash = List.VersionHash();
+      unsigned short Hash = List.VersionHash();
       pkgCache::VerIterator Ver = Pkg.VersionList();
       Dynamic<pkgCache::VerIterator> DynVer(Ver);
       for (; Ver.end() == false; ++Ver)
       {
-	 if (Ver->Hash == Hash && Version == Ver.VerStr())
+	 if (List.SameVersion(Hash, Ver) == true && Version == Ver.VerStr())
 	 {
 	    if (List.CollectFileProvides(Cache,Ver) == false)
 	       return _error->Error(_("Error occurred while processing %s (%s%d)"),
@@ -909,7 +915,7 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg,
 	 if (unlikely(index == 0))
 	    return false;
 	 if (OldDepLast != 0 && oldMap != Map.Data())
-	    OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
+	    OldDepLast += (map_ptrloc const * const) Map.Data() - (map_ptrloc const * const) oldMap;
       }
    }
    return NewDepends(Pkg, Ver, index, Op, Type, OldDepLast);
@@ -948,7 +954,7 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg,
       for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; ++D)
 	 OldDepLast = &D->NextDepends;
    } else if (oldMap != Map.Data())
-      OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
+      OldDepLast += (map_ptrloc const * const) Map.Data() - (map_ptrloc const * const) oldMap;
 
    Dep->NextDepends = *OldDepLast;
    *OldDepLast = Dep.Index();
@@ -1045,6 +1051,12 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator &Ver,
    return true;
 }
 									/*}}}*/
+bool pkgCacheGenerator::ListParser::SameVersion(unsigned short const Hash,/*{{{*/
+      pkgCache::VerIterator const &Ver)
+{
+   return Hash == Ver->Hash;
+}
+									/*}}}*/
 // CacheGenerator::SelectFile - Select the current file being parsed	/*{{{*/
 // ---------------------------------------------------------------------
 /* This is used to select which file is to be associated with all newly
@@ -1125,8 +1137,8 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
    if (unlikely(idxString == 0))
       return 0;
    if (oldMap != Map.Data()) {
-      Last += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
-      I += (pkgCache::StringItem*) Map.Data() - (pkgCache::StringItem*) oldMap;
+      Last += (map_ptrloc const * const) Map.Data() - (map_ptrloc const * const) oldMap;
+      I += (pkgCache::StringItem const * const) Map.Data() - (pkgCache::StringItem const * const) oldMap;
    }
    *Last = Item;
 
@@ -1249,10 +1261,10 @@ static bool CheckValidity(const string &CacheFile,
 static unsigned long ComputeSize(FileIterator Start,FileIterator End)
 {
    unsigned long TotalSize = 0;
-   for (; Start != End; ++Start)
+   for (; Start < End; ++Start)
    {
       if ((*Start)->HasPackages() == false)
-	 continue;      
+	 continue;
       TotalSize += (*Start)->Size();
    }
    return TotalSize;
@@ -1333,7 +1345,7 @@ DynamicMMap* pkgCacheGenerator::CreateDynamicMMap(FileFd *CacheF, unsigned long
    the cache will be stored there. This is pretty much mandetory if you
    are using AllowMem. AllowMem lets the function be run as non-root
    where it builds the cache 'fast' into a memory buffer. */
-__deprecated bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
+APT_DEPRECATED bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
 			MMap **OutMap, bool AllowMem)
    { return pkgCacheGenerator::MakeStatusCache(List, &Progress, OutMap, AllowMem); }
 bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress,
@@ -1534,7 +1546,7 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
 // CacheGenerator::MakeOnlyStatusCache - Build only a status files cache/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-__deprecated bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
+APT_DEPRECATED bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
    { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); }
 bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap)
 {
@@ -1580,7 +1592,7 @@ static bool IsDuplicateDescription(pkgCache::DescIterator Desc,
 }
 									/*}}}*/
 // CacheGenerator::FinishCache						/*{{{*/
-bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
+bool pkgCacheGenerator::FinishCache(OpProgress * /*Progress*/)
 {
    return true;
 }
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 428e8459b..1e1a71026 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -19,16 +19,18 @@
 #ifndef PKGLIB_PKGCACHEGEN_H
 #define PKGLIB_PKGCACHEGEN_H
 
-
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/md5.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
 
 #include <vector>
+#include <string>
 
+class FileFd;
 class pkgSourceList;
 class OpProgress;
-class MMap;
 class pkgIndexFile;
 
 class pkgCacheGenerator							/*{{{*/
@@ -36,10 +38,10 @@ class pkgCacheGenerator							/*{{{*/
    private:
 
    pkgCache::StringItem *UniqHash[26];
-   map_ptrloc WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); };
-   map_ptrloc WriteStringInMap(const char *String);
-   map_ptrloc WriteStringInMap(const char *String, const unsigned long &Len);
-   map_ptrloc AllocateInMap(const unsigned long &size);
+   APT_HIDDEN map_ptrloc WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); };
+   APT_HIDDEN map_ptrloc WriteStringInMap(const char *String);
+   APT_HIDDEN map_ptrloc WriteStringInMap(const char *String, const unsigned long &Len);
+   APT_HIDDEN map_ptrloc AllocateInMap(const unsigned long &size);
 
    public:
    
@@ -80,7 +82,7 @@ class pkgCacheGenerator							/*{{{*/
    bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver,
 		   map_ptrloc const Version, unsigned int const &Op,
 		   unsigned int const &Type, map_ptrloc* &OldDepLast);
-   __deprecated unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,unsigned long Next)
+   unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,unsigned long Next) APT_DEPRECATED
    { return NewVersion(Ver, VerStr, 0, 0, Next); }
    unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,
 			    map_ptrloc const ParentPkg, unsigned long const Hash,
@@ -102,7 +104,7 @@ class pkgCacheGenerator							/*{{{*/
 
    bool HasFileDeps() {return FoundFileDeps;};
    bool MergeFileProvides(ListParser &List);
-   __deprecated bool FinishCache(OpProgress *Progress);
+   bool FinishCache(OpProgress *Progress) APT_DEPRECATED APT_CONST;
 
    static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress,
 			MMap **OutMap = 0,bool AllowMem = false);
@@ -115,14 +117,14 @@ class pkgCacheGenerator							/*{{{*/
    ~pkgCacheGenerator();
 
    private:
-   bool MergeListGroup(ListParser &List, std::string const &GrpName);
-   bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
-   bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
+   APT_HIDDEN bool MergeListGroup(ListParser &List, std::string const &GrpName);
+   APT_HIDDEN bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
+   APT_HIDDEN bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
 			 std::string const &Version, pkgCache::VerIterator* &OutVer);
 
-   bool AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P,
+   APT_HIDDEN bool AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P,
 			   pkgCache::VerIterator &V);
-   bool AddImplicitDepends(pkgCache::VerIterator &V, pkgCache::PkgIterator &D);
+   APT_HIDDEN bool AddImplicitDepends(pkgCache::VerIterator &V, pkgCache::PkgIterator &D);
 };
 									/*}}}*/
 // This is the abstract package list parser class.			/*{{{*/
@@ -162,6 +164,15 @@ class pkgCacheGenerator::ListParser
    virtual std::string DescriptionLanguage() = 0;
    virtual MD5SumValue Description_md5() = 0;
    virtual unsigned short VersionHash() = 0;
+   /** compare currently parsed version with given version
+    *
+    * \param Hash of the currently parsed version
+    * \param Ver to compare with
+    */
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+   virtual
+#endif
+      APT_PURE bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
 			   pkgCache::VerIterator &Ver) = 0;
    virtual unsigned long Offset() = 0;
@@ -170,8 +181,8 @@ class pkgCacheGenerator::ListParser
    virtual bool Step() = 0;
    
    inline bool HasFileDeps() {return FoundFileDeps;};
-   virtual bool CollectFileProvides(pkgCache &Cache,
-				    pkgCache::VerIterator &Ver) {return true;};
+   virtual bool CollectFileProvides(pkgCache &/*Cache*/,
+				    pkgCache::VerIterator &/*Ver*/) {return true;};
 
    ListParser() : FoundFileDeps(false) {};
    virtual ~ListParser() {};
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index 36dab3480..c403e4dc3 100644
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -14,7 +14,11 @@
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/configuration.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <stddef.h>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index 3658435e8..b5237b3a0 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -17,8 +17,9 @@
 #ifndef PKGLIB_PKGRECORDS_H
 #define PKGLIB_PKGRECORDS_H
 
-
 #include <apt-pkg/pkgcache.h>
+
+#include <string>
 #include <vector>
 
 class pkgRecords							/*{{{*/
@@ -70,7 +71,7 @@ class pkgRecords::Parser						/*{{{*/
    virtual std::string Homepage() {return std::string();}
 
    // An arbitrary custom field
-   virtual std::string RecordField(const char *fieldName) { return std::string();};
+   virtual std::string RecordField(const char * /*fieldName*/) { return std::string();};
 
    // The record in binary form
    virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;};
diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc
index 05ba6e0e6..14d090c7a 100644
--- a/apt-pkg/pkgsystem.cc
+++ b/apt-pkg/pkgsystem.cc
@@ -13,7 +13,8 @@
 #include<config.h>
 
 #include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/policy.h>
+#include <apt-pkg/macros.h>
+
 #include <cassert>
 #include <cstring>
 									/*}}}*/
@@ -36,7 +37,7 @@ pkgSystem::pkgSystem() : Label(NULL), VS(NULL)
 // System::GetSystem - Get the named system				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgSystem *pkgSystem::GetSystem(const char *Label)
+APT_PURE pkgSystem *pkgSystem::GetSystem(const char *Label)
 {
    for (unsigned I = 0; I != GlobalListLen; I++)
       if (strcmp(SysList[I]->Label,Label) == 0)
diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index eb75df412..6e33c67ed 100644
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -38,6 +38,7 @@
 #define PKGLIB_PKGSYSTEM_H
 
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
 #include <vector>
 
@@ -50,7 +51,6 @@ class pkgPackageManager;
 class pkgVersioningSystem;
 class Configuration;
 class pkgIndexFile;
-class PkgFileIterator;
 
 class pkgSystem
 {   
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index d0f97441d..3cfc32829 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -33,7 +33,15 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sptr.h>
-
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/versionmatch.h>
+
+#include <ctype.h>
+#include <stddef.h>
+#include <string.h>
+#include <string>
+#include <vector>
 #include <iostream>
 #include <sstream>
 
@@ -325,7 +333,7 @@ pkgCache::VerIterator pkgPolicy::GetMatch(pkgCache::PkgIterator const &Pkg)
 // Policy::GetPriority - Get the priority of the package pin		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg)
+APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg)
 {
    if (Pins[Pkg->ID].Type != pkgVersionMatch::None)
    {
@@ -337,7 +345,7 @@ signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg)
    
    return 0;
 }
-signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File)
+APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File)
 {
    return PFPriority[File->ID];
 }
@@ -349,7 +357,7 @@ signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File)
    all over the place rather than forcing a special format */
 class PreferenceSection : public pkgTagSection
 {
-   void TrimRecord(bool BeforeRecord, const char* &End)
+   void TrimRecord(bool /*BeforeRecord*/, const char* &End)
    {
       for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r' || Stop[0] == '#'); Stop++)
 	 if (Stop[0] == '#')
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index 5172a3c3b..f15d8c0a0 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -33,10 +33,13 @@
 #ifndef PKGLIB_POLICY_H
 #define PKGLIB_POLICY_H
 
-
 #include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/versionmatch.h>
+
 #include <vector>
+#include <string>
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::vector;
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 1f5179885..e37899ec6 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -18,7 +18,16 @@
 #include <apt-pkg/metaindex.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/tagfile.h>
-
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <ctype.h>
+#include <stddef.h>
+#include <time.h>
+#include <cstring>
+#include <map>
+#include <string>
+#include <vector>
 #include <fstream>
 #include <algorithm>
 
diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 0ccb4aa00..9df0c1d74 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -27,18 +27,27 @@
 #ifndef PKGLIB_SOURCELIST_H
 #define PKGLIB_SOURCELIST_H
 
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
+
+#include <time.h>
+
 #include <string>
 #include <vector>
 #include <map>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/tagfile.h>
 
 #ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/tagfile.h>
+#endif
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/metaindex.h>
 using std::string;
 using std::vector;
 #endif
 
+class FileFd;
+class pkgTagSection;
 class pkgAcquire;
 class pkgIndexFile;
 class metaIndex;
@@ -55,7 +64,7 @@ class pkgSourceList
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;
-      static Type *GetType(const char *Type);
+      static Type *GetType(const char *Type) APT_PURE;
 
       const char *Name;
       const char *Label;
diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc
index 60b62850a..775cf2e5f 100644
--- a/apt-pkg/srcrecords.cc
+++ b/apt-pkg/srcrecords.cc
@@ -16,8 +16,13 @@
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>
-#include <apt-pkg/strutl.h>
 #include <apt-pkg/metaindex.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/macros.h>
+
+#include <string.h>
+#include <string>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index 796d2e1bd..58a5e242f 100644
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -13,6 +13,7 @@
 #ifndef PKGLIB_SRCRECORDS_H
 #define PKGLIB_SRCRECORDS_H
 
+#include <apt-pkg/macros.h>
 
 #include <string>
 #include <vector>
@@ -74,7 +75,7 @@ class pkgSrcRecords
 
       //FIXME: Add a parameter to specify which architecture to use for [wildcard] matching
       virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0;
-      static const char *BuildDepType(unsigned char const &Type);
+      static const char *BuildDepType(unsigned char const &Type) APT_PURE;
 
       virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;
       
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 832a40d1e..91d176e3c 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -21,6 +21,8 @@
 #include <string>
 #include <stdio.h>
 #include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -83,7 +85,7 @@ pkgTagFile::~pkgTagFile()
 }
 									/*}}}*/
 // TagFile::Offset - Return the current offset in the buffer		/*{{{*/
-unsigned long pkgTagFile::Offset()
+APT_PURE unsigned long pkgTagFile::Offset()
 {
    return d->iOffset;
 }
@@ -471,7 +473,7 @@ bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags,
       return true;
    return FindFlag(Flags, Flag, Start, Stop);
 }
-bool const pkgTagSection::FindFlag(unsigned long &Flags, unsigned long Flag,
+bool pkgTagSection::FindFlag(unsigned long &Flags, unsigned long Flag,
 					char const* Start, char const* Stop)
 {
    switch (StringToBool(string(Start, Stop)))
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 518d3dbcd..d5b62e76d 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -20,6 +20,8 @@
 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 
+#include <apt-pkg/macros.h>
+
 #include <stdio.h>
 
 #include <string>
@@ -65,7 +67,7 @@ class pkgTagSection
    unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const;
    bool FindFlag(const char *Tag,unsigned long &Flags,
 		 unsigned long Flag) const;
-   bool static const FindFlag(unsigned long &Flags, unsigned long Flag,
+   bool static FindFlag(unsigned long &Flags, unsigned long Flag,
 				const char* Start, const char* Stop);
    bool Scan(const char *Start,unsigned long MaxLength);
    inline unsigned long size() const {return Stop - Section;};
@@ -93,9 +95,9 @@ class pkgTagFile
 {
    pkgTagFilePrivate *d;
 
-   bool Fill();
-   bool Resize();
-   bool Resize(unsigned long long const newSize);
+   APT_HIDDEN bool Fill();
+   APT_HIDDEN bool Resize();
+   APT_HIDDEN bool Resize(unsigned long long const newSize);
 
    public:
 
diff --git a/apt-pkg/update.cc b/apt-pkg/update.cc
index 97be5490b..5d5b19626 100644
--- a/apt-pkg/update.cc
+++ b/apt-pkg/update.cc
@@ -1,24 +1,17 @@
-
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/update.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/acquire-item.h>
-#include <apt-pkg/edsp.h>
-#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/progress.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/acquire.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/update.h>
 
-#include <sys/types.h>
-#include <cstdlib>
-#include <algorithm>
-#include <iostream>
-#include <stdio.h>
+#include <string>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc
index d6f6933dd..7926845c2 100644
--- a/apt-pkg/upgrade.cc
+++ b/apt-pkg/upgrade.cc
@@ -1,24 +1,17 @@
-
 // Include Files							/*{{{*/
 #include <config.h>
 
 #include <apt-pkg/algorithms.h>
-#include <apt-pkg/upgrade.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/sptr.h>
-#include <apt-pkg/acquire-item.h>
 #include <apt-pkg/edsp.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/fileutl.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/progress.h>
+#include <apt-pkg/upgrade.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
-#include <sys/types.h>
-#include <cstdlib>
-#include <algorithm>
-#include <iostream>
-#include <stdio.h>
+#include <string>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h
index c4973472f..aa883df10 100644
--- a/apt-pkg/upgrade.h
+++ b/apt-pkg/upgrade.h
@@ -10,12 +10,14 @@
 #ifndef PKGLIB_UPGRADE_H
 #define PKGLIB_UPGRADE_H
 
+class pkgDepCache;
+
 namespace APT {
    namespace Upgrade {
       // FIXME: make this "enum class UpgradeMode {" once we enable c++11
       enum UpgradeMode {
          FORBID_REMOVE_PACKAGES = 1,
-         FORBID_INSTALL_NEW_PACKAGES = 2,
+         FORBID_INSTALL_NEW_PACKAGES = 2
       };
       bool Upgrade(pkgDepCache &Cache, int UpgradeMode);
    }
diff --git a/apt-pkg/vendor.cc b/apt-pkg/vendor.cc
index fc03ec845..d4add560e 100644
--- a/apt-pkg/vendor.cc
+++ b/apt-pkg/vendor.cc
@@ -1,10 +1,14 @@
 #include<config.h>
 
-#include <iostream>
-#include <apt-pkg/error.h>
 #include <apt-pkg/vendor.h>
 #include <apt-pkg/configuration.h>
 
+#include <iostream>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 Vendor::Vendor(std::string VendorID,
                std::string Origin,
 	       std::vector<struct Vendor::Fingerprint *> *FingerprintList)
@@ -31,7 +35,7 @@ const std::string Vendor::LookupFingerprint(std::string Print) const
       return (*Elt).second;
 }
 
-bool Vendor::CheckDist(std::string Dist)
+APT_CONST bool Vendor::CheckDist(std::string /*Dist*/)
 {
    return true;
 }
diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h
index 6484adf9b..2d2e2b0ae 100644
--- a/apt-pkg/vendor.h
+++ b/apt-pkg/vendor.h
@@ -11,7 +11,7 @@ using std::string;
 #endif
 
 // A class representing a particular software provider.
-class __deprecated Vendor
+class APT_DEPRECATED Vendor
 {
    public:
    struct Fingerprint
diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 602425624..fb33ff17d 100644
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -3,9 +3,16 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
+
+#include <stddef.h>
+#include <iostream>
+#include <string>
+#include <vector>
+
 #include <apti18n.h>
 
 #if __GNUC__ >= 4
+	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
@@ -157,5 +164,5 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)	/*
 									/*}}}*/
 
 #if __GNUC__ >= 4
-	#pragma GCC diagnostic warning "-Wdeprecated-declarations"
+	#pragma GCC diagnostic pop
 #endif
diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h
index a86ccde7c..bc3702a93 100644
--- a/apt-pkg/vendorlist.h
+++ b/apt-pkg/vendorlist.h
@@ -27,7 +27,7 @@ using std::vector;
 class Vendor;
 class Configuration;
 
-class __deprecated pkgVendorList
+class APT_DEPRECATED pkgVendorList
 {
    protected:
    std::vector<Vendor const *> VendorList;
diff --git a/apt-pkg/version.cc b/apt-pkg/version.cc
index cb2c34c0f..29bee46da 100644
--- a/apt-pkg/version.cc
+++ b/apt-pkg/version.cc
@@ -11,8 +11,8 @@
 #include<config.h>
 
 #include <apt-pkg/version.h>
-#include <apt-pkg/pkgcache.h>
 
+#include <string.h>
 #include <stdlib.h>
 									/*}}}*/
     
diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index e0e0e6c14..d98809f7e 100644
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -33,7 +33,7 @@ class pkgVersioningSystem
    // Global list of VS's
    static pkgVersioningSystem **GlobalList;
    static unsigned long GlobalListLen;
-   static pkgVersioningSystem *GetVS(const char *Label);
+   static pkgVersioningSystem *GetVS(const char *Label) APT_PURE;
    
    const char *Label;
    
diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 26262a010..284098bdf 100644
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -16,11 +16,16 @@
 #include <apt-pkg/versionmatch.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
 #include <stdio.h>
 #include <ctype.h>
 #include <fnmatch.h>
-#include <sys/types.h>
 #include <regex.h>
 									/*}}}*/
 
diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index 433396fc9..4c8f704c8 100644
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -35,16 +35,17 @@
 #ifndef PKGLIB_VERSIONMATCH_H
 #define PKGLIB_VERSIONMATCH_H
 
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
 #include <string>
-#include <apt-pkg/pkgcache.h>
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 #endif
 
 class pkgVersionMatch
-{   
+{
    // Version Matching
    std::string VerStr;
    bool VerPrefixMatch;
@@ -60,20 +61,20 @@ class pkgVersionMatch
    std::string RelComponent;
    std::string RelArchitecture;
    bool MatchAll;
-   
+
    // Origin Matching
    std::string OrSite;
-   
+
    public:
-   
+
    enum MatchType {None = 0,Version,Release,Origin} Type;
-   
-   bool MatchVer(const char *A,std::string B,bool Prefix);
+
+   bool MatchVer(const char *A,std::string B,bool Prefix) APT_PURE;
    bool ExpressionMatches(const char *pattern, const char *string);
    bool ExpressionMatches(const std::string& pattern, const char *string);
    bool FileMatch(pkgCache::PkgFileIterator File);
    pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg);
-			       
+
    pkgVersionMatch(std::string Data,MatchType Type);
 };
 
diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index d25ffef75..0f5b53e50 100644
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -10,18 +10,21 @@
 // Include files							/*{{{*/
 #include<config.h>
 
+#include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 
+#include <apt-private/acqprogress.h>
+
+#include <string.h>
 #include <stdio.h>
 #include <signal.h>
 #include <iostream>
 #include <unistd.h>
 
-#include "acqprogress.h"
 #include <apti18n.h>
 									/*}}}*/
 
@@ -42,12 +45,12 @@ AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet)
 // AcqTextStatus::Start - Downloading has started			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void AcqTextStatus::Start() 
+void AcqTextStatus::Start()
 {
-   pkgAcquireStatus::Start(); 
+   pkgAcquireStatus::Start();
    BlankLine[0] = 0;
    ID = 1;
-};
+}
 									/*}}}*/
 // AcqTextStatus::IMSHit - Called when an item got a HIT response	/*{{{*/
 // ---------------------------------------------------------------------
@@ -58,14 +61,14 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
       return;
 
    if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r';   
-   
+      cout << '\r' << BlankLine << '\r';
+
    cout << _("Hit ") << Itm.Description;
    if (Itm.Owner->FileSize != 0)
       cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
    cout << endl;
    Update = true;
-};
+}
 									/*}}}*/
 // AcqTextStatus::Fetch - An item has started to download		/*{{{*/
 // ---------------------------------------------------------------------
@@ -75,28 +78,28 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
    Update = true;
    if (Itm.Owner->Complete == true)
       return;
-   
+
    Itm.Owner->ID = ID++;
-   
+
    if (Quiet > 1)
       return;
 
    if (Quiet <= 0)
       cout << '\r' << BlankLine << '\r';
-   
+
    cout << _("Get:") << Itm.Owner->ID << ' ' << Itm.Description;
    if (Itm.Owner->FileSize != 0)
       cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
    cout << endl;
-};
+}
 									/*}}}*/
 // AcqTextStatus::Done - Completed a download				/*{{{*/
 // ---------------------------------------------------------------------
 /* We don't display anything... */
-void AcqTextStatus::Done(pkgAcquire::ItemDesc &Itm)
+void AcqTextStatus::Done(pkgAcquire::ItemDesc &/*Itm*/)
 {
    Update = true;
-};
+}
 									/*}}}*/
 // AcqTextStatus::Fail - Called when an item fails to download		/*{{{*/
 // ---------------------------------------------------------------------
@@ -109,10 +112,10 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
    // Ignore certain kinds of transient failures (bad code)
    if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
       return;
-      
+
    if (Quiet <= 0)
       cout << '\r' << BlankLine << '\r';
-   
+
    if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
    {
       cout << _("Ign ") << Itm.Description << endl;
@@ -122,9 +125,9 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
       cout << _("Err ") << Itm.Description << endl;
       cout << "  " << Itm.Owner->ErrorText << endl;
    }
-   
+
    Update = true;
-};
+}
 									/*}}}*/
 // AcqTextStatus::Stop - Finished downloading				/*{{{*/
 // ---------------------------------------------------------------------
@@ -154,12 +157,12 @@ void AcqTextStatus::Stop()
 bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 {
    pkgAcquireStatus::Pulse(Owner);
-   
+
    if (Quiet > 0)
       return true;
-   
+
    enum {Long = 0,Medium,Short} Mode = Medium;
-   
+
    char Buffer[sizeof(BlankLine)];
    char *End = Buffer + sizeof(Buffer);
    char *S = Buffer;
@@ -174,8 +177,8 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 	I = Owner->WorkerStep(I))
    {
       S += strlen(S);
-      
-      // There is no item running 
+
+      // There is no item running
       if (I->CurrentItem == 0)
       {
 	 if (I->Status.empty() == false)
@@ -183,12 +186,12 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 	    snprintf(S,End-S," [%s]",I->Status.c_str());
 	    Shown = true;
 	 }
-	 
+
 	 continue;
       }
 
       Shown = true;
-      
+
       // Add in the short description
       if (I->CurrentItem->Owner->ID != 0)
 	 snprintf(S,End-S," [%lu %s",I->CurrentItem->Owner->ID,
@@ -203,7 +206,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 	 snprintf(S,End-S," %s",I->CurrentItem->Owner->Mode);
 	 S += strlen(S);
       }
-            
+
       // Add the current progress
       if (Mode == Long)
 	 snprintf(S,End-S," %llu",I->CurrentSize);
@@ -213,7 +216,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 	    snprintf(S,End-S," %sB",SizeToStr(I->CurrentSize).c_str());
       }
       S += strlen(S);
-      
+
       // Add the total size and percent
       if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false)
       {
@@ -223,7 +226,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 	 else
 	    snprintf(S,End-S,"/%sB %.0f%%",SizeToStr(I->TotalSize).c_str(),
 		     (I->CurrentSize*100.0)/I->TotalSize);
-      }      
+      }
       S += strlen(S);
       snprintf(S,End-S,"]");
    }
@@ -231,26 +234,26 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
    // Show something..
    if (Shown == false)
       snprintf(S,End-S,_(" [Working]"));
-      
+
    /* Put in the ETA and cps meter, block off signals to prevent strangeness
       during resizing */
    sigset_t Sigs,OldSigs;
    sigemptyset(&Sigs);
    sigaddset(&Sigs,SIGWINCH);
    sigprocmask(SIG_BLOCK,&Sigs,&OldSigs);
-   
+
    if (CurrentCPS != 0)
-   {      
+   {
       char Tmp[300];
       unsigned long long ETA = (TotalBytes - CurrentBytes)/CurrentCPS;
       sprintf(Tmp," %sB/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
       unsigned int Len = strlen(Buffer);
       unsigned int LenT = strlen(Tmp);
       if (Len + LenT < ScreenWidth)
-      {	 
+      {
 	 memset(Buffer + Len,' ',ScreenWidth - Len);
 	 strcpy(Buffer + ScreenWidth - LenT,Tmp);
-      }      
+      }
    }
    Buffer[ScreenWidth] = 0;
    BlankLine[ScreenWidth] = 0;
@@ -264,11 +267,11 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
    else
       cout << '\r' << BlankLine << '\r' << Buffer << flush;
    if (_config->FindB("Apt::Color", false) == true)
-      cout << _config->Find("APT::Color::Neutral");
+      cout << _config->Find("APT::Color::Neutral") << flush;
 
    memset(BlankLine,' ',strlen(Buffer));
    BlankLine[strlen(Buffer)] = 0;
-   
+
    Update = false;
 
    return true;
diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index e12dafe50..71a10d78a 100644
--- a/apt-private/acqprogress.h
+++ b/apt-private/acqprogress.h
@@ -10,18 +10,19 @@
 #define ACQPROGRESS_H
 
 #include <apt-pkg/acquire.h>
+#include <apt-pkg/macros.h>
 
 #include <string>
 
-class AcqTextStatus : public pkgAcquireStatus
+class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus
 {
    unsigned int &ScreenWidth;
    char BlankLine[1024];
    unsigned long ID;
    unsigned long Quiet;
-   
+
    public:
-   
+
    virtual bool MediaChange(std::string Media,std::string Drive);
    virtual void IMSHit(pkgAcquire::ItemDesc &Itm);
    virtual void Fetch(pkgAcquire::ItemDesc &Itm);
@@ -29,7 +30,7 @@ class AcqTextStatus : public pkgAcquireStatus
    virtual void Fail(pkgAcquire::ItemDesc &Itm);
    virtual void Start();
    virtual void Stop();
-   
+
    bool Pulse(pkgAcquire *Owner);
 
    AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet);
diff --git a/apt-private/makefile b/apt-private/makefile
index 728890b9b..9a3fbdb29 100644
--- a/apt-private/makefile
+++ b/apt-private/makefile
@@ -8,21 +8,14 @@ HEADER_TARGETDIRS = apt-private
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
-# The library name and version (indirectly used from init.h)
-include ../buildlib/libversion.mak
-
 # The library name
 LIBRARY=apt-private
 MAJOR=0.0
 MINOR=0
 SLIBS=$(PTHREADLIB) -lapt-pkg
+CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
 
-PRIVATES=list install download output cachefile cacheset update upgrade cmndline moo search show main utils sources
-SOURCE += $(foreach private, $(PRIVATES), private-$(private).cc)
-HEADERS += $(foreach private, $(PRIVATES), private-$(private).h)
-
-SOURCE+= acqprogress.cc
-HEADERS+= acqprogress.h private-cacheset.h
+SOURCE = $(wildcard *.cc)
+HEADERS = $(addprefix apt-private/,$(wildcard *.h))
 
-HEADERS := $(addprefix apt-private/,$(HEADERS))
 include $(LIBRARY_H)
diff --git a/apt-private/private-cachefile.cc b/apt-private/private-cachefile.cc
index c822b9bad..5e955ac39 100644
--- a/apt-private/private-cachefile.cc
+++ b/apt-private/private-cachefile.cc
@@ -4,11 +4,17 @@
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/upgrade.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
-#include <cstdlib>
+#include <apt-private/private-output.h>
+#include <apt-private/private-cachefile.h>
 
-#include "private-output.h"
-#include "private-cachefile.h"
+#include <string.h>
+#include <ostream>
+#include <cstdlib>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-private/private-cachefile.h b/apt-private/private-cachefile.h
index f24d93020..dce7e0a3a 100644
--- a/apt-private/private-cachefile.h
+++ b/apt-private/private-cachefile.h
@@ -3,16 +3,19 @@
 
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/progress.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/macros.h>
 
 
 // class CacheFile - Cover class for some dependency cache functions	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-class CacheFile : public pkgCacheFile
+class APT_PUBLIC CacheFile : public pkgCacheFile
 {
    static pkgCache *SortCache;
-   static int NameComp(const void *a,const void *b);
-   
+   APT_HIDDEN static int NameComp(const void *a,const void *b) APT_PURE;
+
    public:
    pkgCache::Package **List;
    
diff --git a/apt-private/private-cacheset.cc b/apt-private/private-cacheset.cc
index a7dc0e800..e37e7b227 100644
--- a/apt-private/private-cacheset.cc
+++ b/apt-private/private-cacheset.cc
@@ -1,9 +1,18 @@
+#include <config.h>
+
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/depcache.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/policy.h>
+
+#include <apt-private/private-cacheset.h>
+
+#include <stddef.h>
 
-#include "private-cacheset.h"
+#include <apti18n.h>
 
 bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, 
                                  LocalitySortedVersionSet &output_set,
@@ -64,7 +73,13 @@ bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile,
       else 
       {
          pkgPolicy *policy = CacheFile.GetPolicy();
-         output_set.insert(policy->GetCandidateVer(P));
+         if (policy->GetCandidateVer(P).IsGood())
+            output_set.insert(policy->GetCandidateVer(P));
+         else 
+            // no candidate, this may happen for packages in 
+            // dpkg "deinstall ok config-file" state - we pick the first ver
+            // (which should be the only one)
+            output_set.insert(P.VersionList());
       }
    }
    progress.Done();
diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h
index 322b3be6b..854d16922 100644
--- a/apt-private/private-cacheset.h
+++ b/apt-private/private-cacheset.h
@@ -1,17 +1,32 @@
 #ifndef APT_PRIVATE_CACHESET_H
 #define APT_PRIVATE_CACHESET_H
 
+#include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/sptr.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
 
 #include <algorithm>
 #include <vector>
+#include <string.h>
+#include <list>
+#include <ostream>
+#include <set>
+#include <string>
+#include <utility>
 
 #include "private-output.h"
 
 #include <apti18n.h>
 
+class OpProgress;
+
 struct VersionSortDescriptionLocality
 {
    bool operator () (const pkgCache::VerIterator &v_lhs, 
@@ -42,8 +57,8 @@ typedef APT::VersionContainer<
 
 class Matcher {
 public:
-    virtual bool operator () (const pkgCache::PkgIterator &P) {
-        return true;};
+    virtual bool operator () (const pkgCache::PkgIterator &/*P*/) {
+        return true;}
 };
 
 // FIXME: add default argument for OpProgress (or overloaded function)
@@ -111,8 +126,8 @@ public:
 				Pkg.FullName(true).c_str(), pattern.c_str());
 		explicitlyNamed = false;
 	}
-	virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver,
-				 std::string const &ver, bool const verIsRel) {
+	virtual void showSelectedVersion(pkgCache::PkgIterator const &/*Pkg*/, pkgCache::VerIterator const Ver,
+				 std::string const &ver, bool const /*verIsRel*/) {
 		if (ver == Ver.VerStr())
 			return;
 		selectedByRelease.push_back(make_pair(Ver, ver));
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index ef7d65f3c..a21a9dc8c 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -2,19 +2,17 @@
 #include <config.h>
 
 #include <apt-pkg/cmndline.h>
-#include <apt-pkg/configuration.h>
 
-#include <vector>
+#include <apt-private/private-cmndline.h>
 
+#include <vector>
 #include <stdarg.h>
 #include <string.h>
 
-#include "private-cmndline.h"
-
 #include <apti18n.h>
 									/*}}}*/
 
-bool strcmp_match_in_list(char const * const Cmd, ...)			/*{{{*/
+APT_SENTINEL static bool strcmp_match_in_list(char const * const Cmd, ...)		/*{{{*/
 {
    va_list args;
    bool found = false;
@@ -33,7 +31,7 @@ bool strcmp_match_in_list(char const * const Cmd, ...)			/*{{{*/
 									/*}}}*/
 #define addArg(w,x,y,z) Args.push_back(CommandLine::MakeArgs(w,x,y,z))
 #define CmdMatches(...) strcmp_match_in_list(Cmd, __VA_ARGS__, NULL)
-bool addArgumentsAPTCache(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
+static bool addArgumentsAPTCache(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
 {
    if (CmdMatches("depends", "rdepends", "xvcg", "dotty"))
    {
@@ -82,7 +80,7 @@ bool addArgumentsAPTCache(std::vector<CommandLine::Args> &Args, char const * con
    return true;
 }
 									/*}}}*/
-bool addArgumentsAPTCDROM(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
+static bool addArgumentsAPTCDROM(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
 {
    if (CmdMatches("add", "ident") == false)
       return false;
@@ -100,7 +98,7 @@ bool addArgumentsAPTCDROM(std::vector<CommandLine::Args> &Args, char const * con
    return true;
 }
 									/*}}}*/
-bool addArgumentsAPTConfig(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
+static bool addArgumentsAPTConfig(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
 {
    if (CmdMatches("dump"))
    {
@@ -115,10 +113,10 @@ bool addArgumentsAPTConfig(std::vector<CommandLine::Args> &Args, char const * co
    return true;
 }
 									/*}}}*/
-bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
+static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
 {
    if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade",
-	    "dselect-upgrade", "autoremove"))
+	    "dselect-upgrade", "autoremove", "full-upgrade"))
    {
       addArg(0, "show-progress", "DpkgPM::Progress", 0);
       addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0);
@@ -141,6 +139,7 @@ bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const
    {
       addArg('b', "compile", "APT::Get::Compile", 0);
       addArg('b', "build", "APT::Get::Compile", 0);
+      addArg('P', "build-profiles", "APT::Build-Profiles", CommandLine::HasArg);
       addArg(0, "diff-only", "APT::Get::Diff-Only", 0);
       addArg(0, "debian-only", "APT::Get::Diff-Only", 0);
       addArg(0, "tar-only", "APT::Get::Tar-Only", 0);
@@ -149,6 +148,7 @@ bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const
    else if (CmdMatches("build-dep"))
    {
       addArg('a', "host-architecture", "APT::Get::Host-Architecture", CommandLine::HasArg);
+      addArg('P', "build-profiles", "APT::Build-Profiles", CommandLine::HasArg);
       addArg(0, "purge", "APT::Get::Purge", 0);
       addArg(0, "solver", "APT::Solver", CommandLine::HasArg);
       // this has no effect *but* sbuild is using it (see LP: #1255806)
@@ -163,7 +163,7 @@ bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const
 
    if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade",
 	    "deselect-upgrade", "autoremove", "clean", "autoclean", "check",
-	    "build-dep"))
+	    "build-dep", "full-upgrade"))
    {
       addArg('s', "simulate", "APT::Get::Simulate", 0);
       addArg('s', "just-print", "APT::Get::Simulate", 0);
@@ -200,7 +200,7 @@ bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const
    return true;
 }
 									/*}}}*/
-bool addArgumentsAPTMark(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
+static bool addArgumentsAPTMark(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
 {
    if (CmdMatches("auto", "manual", "hold", "unhold", "showauto",
 	    "showmanual", "showhold", "showholds", "install",
@@ -220,7 +220,7 @@ bool addArgumentsAPTMark(std::vector<CommandLine::Args> &Args, char const * cons
    return true;
 }
 									/*}}}*/
-bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
+static bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
 {
    if (CmdMatches("list"))
    {
diff --git a/apt-private/private-cmndline.h b/apt-private/private-cmndline.h
index 76045ffe7..d0af16782 100644
--- a/apt-private/private-cmndline.h
+++ b/apt-private/private-cmndline.h
@@ -2,9 +2,10 @@
 #define APT_PRIVATE_CMNDLINE_H
 
 #include <apt-pkg/cmndline.h>
+#include <apt-pkg/macros.h>
 
 #include <vector>
 
-std::vector<CommandLine::Args> getCommandArgs(char const * const Program, char const * const Cmd);
+APT_PUBLIC std::vector<CommandLine::Args> getCommandArgs(char const * const Program, char const * const Cmd);
 
 #endif
diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc
index f02991cde..a095f0c67 100644
--- a/apt-private/private-download.cc
+++ b/apt-private/private-download.cc
@@ -7,9 +7,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 
-#include "private-output.h"
-
-#include <locale.h>
+#include <apt-private/private-output.h>
+#include <apt-private/private-download.h>
 
 #include <fstream>
 #include <string>
diff --git a/apt-private/private-download.h b/apt-private/private-download.h
index b8cc8da1e..a108aa531 100644
--- a/apt-private/private-download.h
+++ b/apt-private/private-download.h
@@ -1,9 +1,11 @@
 #ifndef APT_PRIVATE_DOWNLOAD_H
 #define APT_PRIVATE_DOWNLOAD_H
 
-#include <apt-pkg/acquire.h>
+#include <apt-pkg/macros.h>
 
-bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser);
-bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failure, bool * const TransientNetworkFailure);
+class pkgAcquire;
+
+APT_PUBLIC bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser);
+APT_PUBLIC bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failure, bool * const TransientNetworkFailure);
 
 #endif
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index 3adb00b23..107ed398e 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -1,57 +1,45 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/aptconfiguration.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/cmndline.h>
-#include <apt-pkg/init.h>
-#include <apt-pkg/depcache.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/algorithms.h>
+#include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/clean.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
+#include <apt-pkg/algorithms.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cacheset.h>
-#include <apt-pkg/sptr.h>
-#include <apt-pkg/md5.h>
-#include <apt-pkg/versionmatch.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/install-progress.h>
-#include <apt-pkg/init.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/sptr.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/packagemanager.h>
+#include <apt-pkg/pkgcache.h>
 
-#include <set>
-#include <locale.h>
-#include <langinfo.h>
-#include <fstream>
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include <regex.h>
-#include <sys/wait.h>
-#include <sstream>
+#include <algorithm>
+#include <iostream>
+#include <set>
+#include <vector>
 
-#include "private-install.h"
-#include "private-download.h"
-#include "private-cachefile.h"
-#include "private-output.h"
-#include "private-cacheset.h"
-#include "acqprogress.h"
+#include <apt-private/acqprogress.h>
+#include <apt-private/private-install.h>
+#include <apt-private/private-cachefile.h>
+#include <apt-private/private-cacheset.h>
+#include <apt-private/private-download.h>
+#include <apt-private/private-output.h>
 
 #include <apti18n.h>
 									/*}}}*/
+class pkgSourceList;
 
 // InstallPackages - Actually download and install the packages		/*{{{*/
 // ---------------------------------------------------------------------
@@ -156,7 +144,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety)
    if (DebBytes != Cache->DebSize())
    {
       c0out << DebBytes << ',' << Cache->DebSize() << std::endl;
-      c0out << _("How odd.. The sizes didn't match, email apt@packages.debian.org") << std::endl;
+      c0out << _("How odd... The sizes didn't match, email apt@packages.debian.org") << std::endl;
    }
    
    // Number of bytes
@@ -386,7 +374,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety)
 // DoAutomaticRemove - Remove all automatic unused packages		/*{{{*/
 // ---------------------------------------------------------------------
 /* Remove unused automatic packages */
-bool DoAutomaticRemove(CacheFile &Cache)
+static bool DoAutomaticRemove(CacheFile &Cache)
 {
    bool Debug = _config->FindI("Debug::pkgAutoRemove",false);
    bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false);
diff --git a/apt-private/private-install.h b/apt-private/private-install.h
index 2187146d3..5e18560c5 100644
--- a/apt-private/private-install.h
+++ b/apt-private/private-install.h
@@ -1,24 +1,40 @@
 #ifndef APT_PRIVATE_INSTALL_H
 #define APT_PRIVATE_INSTALL_H
 
+#include <apt-pkg/cachefile.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/cacheset.h>
-#include <apt-pkg/cmndline.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/algorithms.h>
+#include <apt-pkg/macros.h>
+
+#include <apt-private/private-output.h>
+
+#include <stddef.h>
+#include <iosfwd>
+#include <list>
+#include <map>
+#include <string>
+#include <utility>
 
-#include "private-cachefile.h"
-#include "private-output.h"
 
 #include <apti18n.h>
 
+class CacheFile;
+class CommandLine;
+
 #define RAMFS_MAGIC     0x858458f6
 
-bool DoInstall(CommandLine &Cmd);
+APT_PUBLIC bool DoInstall(CommandLine &Cmd);
 
 bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache,
                                         std::map<unsigned short, APT::VersionSet> &verset);
 bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache);
 
-bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
+APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
                         bool Safety = true);
 
 
diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index be2e07f43..e85aaf64c 100644
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -1,43 +1,28 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/error.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/cacheset.h>
-#include <apt-pkg/init.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/sourcelist.h>
 #include <apt-pkg/cmndline.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/sptr.h>
-#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/metaindex.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <apt-private/private-cacheset.h>
+#include <apt-private/private-list.h>
+#include <apt-private/private-output.h>
 
+#include <iostream>
 #include <sstream>
-#include <vector>
+#include <map>
+#include <string>
 #include <utility>
-#include <cassert>
-#include <locale.h>
-#include <iostream>
-#include <unistd.h>
-#include <errno.h>
-#include <regex.h>
-#include <stdio.h>
-#include <algorithm>
-
-#include "private-cmndline.h"
-#include "private-list.h"
-#include "private-output.h"
-#include "private-cacheset.h"
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -52,9 +37,9 @@ struct PackageSortAlphabetic						/*{{{*/
        return (l_name < r_name);
     }
 };
-#ifdef PACKAGE_MATCHER_ABI_COMPAT
-#define PackageMatcher PackageNameMatchesFnmatch
-#endif
+
+class PackageNameMatcher : public Matcher
+{
   public:
    PackageNameMatcher(const char **patterns)
    {
@@ -91,7 +76,7 @@ private:
    #undef PackageMatcher
 };
 									/*}}}*/
-void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,	/*{{{*/
+static void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,/*{{{*/
                      pkgCache::PkgIterator P,    
                      std::ostream &outs,
                      bool include_summary=true)
@@ -106,14 +91,13 @@ void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,	/*{{{*/
 									/*}}}*/
 // list - list package based on criteria        			/*{{{*/
 // ---------------------------------------------------------------------
-bool List(CommandLine &Cmd)
+bool DoList(CommandLine &Cmd)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
-   pkgRecords records(CacheFile);
-
    if (unlikely(Cache == NULL))
       return false;
+   pkgRecords records(CacheFile);
 
    const char **patterns;
    const char *all_pattern[] = { "*", NULL};
@@ -138,10 +122,11 @@ bool List(CommandLine &Cmd)
                             Cache->Head().PackageCount,
                             _("Listing"));
    GetLocalitySortedVersionSet(CacheFile, bag, matcher, progress);
+   bool ShowAllVersions = _config->FindB("APT::Cmd::All-Versions", false);
    for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); ++V)
    {
       std::stringstream outs;
-      if(_config->FindB("APT::Cmd::All-Versions", false) == true)
+      if(ShowAllVersions == true)
       {
          ListAllVersions(CacheFile, records, V.ParentPkg(), outs, includeSummary);
          output_map.insert(std::make_pair<std::string, std::string>(
@@ -159,6 +144,18 @@ bool List(CommandLine &Cmd)
       std::cout << (*K).second << std::endl;
 
 
+   // be nice and tell the user if there is more to see
+   if (bag.size() == 1 && ShowAllVersions == false)
+   {
+      // start with -1 as we already displayed one version
+      int versions = -1;
+      pkgCache::VerIterator Ver = *bag.begin();
+      for ( ; Ver.end() == false; Ver++)
+         versions++;
+      if (versions > 0)
+         _error->Notice(P_("There is %i additional version. Please use the '-a' switch to see it", "There are %i additional versions. Please use the '-a' switch to see them.", versions), versions);
+   }
+
    return true;
 }
 
diff --git a/apt-private/private-list.h b/apt-private/private-list.h
index 6f5aad27a..aa2677764 100644
--- a/apt-private/private-list.h
+++ b/apt-private/private-list.h
@@ -1,9 +1,11 @@
 #ifndef APT_PRIVATE_LIST_H
 #define APT_PRIVATE_LIST_H
 
-#include <apt-pkg/cmndline.h>
+#include <apt-pkg/macros.h>
 
-bool List(CommandLine &Cmd);
+class CommandLine;
+
+APT_PUBLIC bool DoList(CommandLine &Cmd);
 
 
 #endif
diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc
index 1fdf3f0be..668b1733a 100644
--- a/apt-private/private-main.cc
+++ b/apt-private/private-main.cc
@@ -1,12 +1,25 @@
+#include <config.h>
 
-#include<unistd.h>
-#include<cstring>
-
+#include <apt-pkg/cmndline.h>
 #include <apt-pkg/configuration.h>
-#include "private-main.h"
+
+#include <apt-private/private-main.h>
+
+#include <iostream>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
 
 #include <apti18n.h>
 
+
+void InitSignals()
+{
+   // Setup the signals
+   signal(SIGPIPE,SIG_IGN);
+}
+
+
 void CheckSimulateMode(CommandLine &CmdL)
 {
    // simulate user-friendly if apt-get has no root privileges
diff --git a/apt-private/private-main.h b/apt-private/private-main.h
index f9a95c4ec..a03bf4441 100644
--- a/apt-private/private-main.h
+++ b/apt-private/private-main.h
@@ -1,9 +1,11 @@
 #ifndef APT_PRIVATE_MAIN_H
 #define APT_PRIVATE_MAIN_H
 
-#include <apt-pkg/cmndline.h>
+#include <apt-pkg/macros.h>
 
-void CheckSimulateMode(CommandLine &CmdL);
+class CommandLine;
 
+APT_PUBLIC void CheckSimulateMode(CommandLine &CmdL);
+APT_PUBLIC void InitSignals();
 
 #endif
diff --git a/apt-private/private-moo.cc b/apt-private/private-moo.cc
index 9b5b94654..a87999150 100644
--- a/apt-private/private-moo.cc
+++ b/apt-private/private-moo.cc
@@ -13,16 +13,20 @@
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/strutl.h>
 
-#include <strings.h>
-#include <sstream>
+#include <apt-private/private-moo.h>
+#include <apt-private/private-output.h>
 
-#include "private-moo.h"
-#include "private-output.h"
+#include <stddef.h>
+#include <string.h>
+#include <time.h>
+#include <iostream>
+#include <sstream>
+#include <string>
 
 #include <apti18n.h>
 									/*}}}*/
 
-std::string getMooLine() {						/*{{{*/
+static std::string getMooLine() {					/*{{{*/
    time_t const timenow = time(NULL);
    struct tm special;
    localtime_r(&timenow, &special);
@@ -60,12 +64,12 @@ std::string getMooLine() {						/*{{{*/
    return out.str();
 }
 									/*}}}*/
-bool printMooLine() {							/*{{{*/
+static bool printMooLine() {						/*{{{*/
    std::cerr << getMooLine() << std::endl;
    return true;
 }
 									/*}}}*/
-bool DoMoo1(CommandLine &CmdL)						/*{{{*/
+bool DoMoo1(CommandLine &)						/*{{{*/
 {
    // our trustworthy super cow since 2001
    if (_config->FindI("quiet") >= 2)
@@ -83,7 +87,7 @@ bool DoMoo1(CommandLine &CmdL)						/*{{{*/
    return true;
 }
 									/*}}}*/
-bool DoMoo2(CommandLine &CmdL)						/*{{{*/
+bool DoMoo2(CommandLine &)						/*{{{*/
 {
    // by Fernando Ribeiro in lp:56125
    if (_config->FindI("quiet") >= 2)
@@ -102,22 +106,22 @@ bool DoMoo2(CommandLine &CmdL)						/*{{{*/
    else
    {
       c1out <<
-	 OutputInDepth(depth, " ") << "         \e[1;97m(\e[0;33m__\e[1;97m)\e[0m\n" <<
-	 OutputInDepth(depth, " ") << " \e[31m_______\e[33m~(\e[1;34m..\e[0;33m)~\e[0m\n" <<
-	 OutputInDepth(depth, " ") << "   \e[33m,----\e[31m\\\e[33m(\e[1;4;35moo\e[0;33m)\e[0m\n" <<
-	 OutputInDepth(depth, " ") << "  \e[33m/|____|,'\e[0m\n" <<
-	 OutputInDepth(depth, " ") << " \e[1;5;97m*\e[0;33m /\\  /\\\e[0m\n" <<
-	 "\e[32m";
+	 OutputInDepth(depth, " ") << "         \033[1;97m(\033[0;33m__\033[1;97m)\033[0m\n" <<
+	 OutputInDepth(depth, " ") << " \033[31m_______\033[33m~(\033[1;34m..\033[0;33m)~\033[0m\n" <<
+	 OutputInDepth(depth, " ") << "   \033[33m,----\033[31m\\\033[33m(\033[1;4;35moo\033[0;33m)\033[0m\n" <<
+	 OutputInDepth(depth, " ") << "  \033[33m/|____|,'\033[0m\n" <<
+	 OutputInDepth(depth, " ") << " \033[1;5;97m*\033[0;33m /\\  /\\\033[0m\n" <<
+	 "\033[32m";
       for (size_t i = moo.length()/2; i > 1; --i)
 	 c1out << "wW";
 
-      c1out << "w\e[0m\n" << moo;
+      c1out << "w\033[0m\n" << moo;
    }
 
    return true;
 }
 									/*}}}*/
-bool DoMoo3(CommandLine &CmdL)						/*{{{*/
+bool DoMoo3(CommandLine &)						/*{{{*/
 {
    // by Robert Millan in deb:134156
    if (_config->FindI("quiet") >= 2)
@@ -134,7 +138,7 @@ bool DoMoo3(CommandLine &CmdL)						/*{{{*/
    return true;
 }
 									/*}}}*/
-bool DoMooApril(CommandLine &CmdL)					/*{{{*/
+bool DoMooApril(CommandLine &)						/*{{{*/
 {
    // by Christopher Allan Webber and proposed by Paul Tagliamonte
    // in a "Community outreach": https://lists.debian.org/debian-devel/2013/04/msg00045.html
diff --git a/apt-private/private-moo.h b/apt-private/private-moo.h
index 7bfc5c1fc..b8e1cfed6 100644
--- a/apt-private/private-moo.h
+++ b/apt-private/private-moo.h
@@ -3,7 +3,7 @@
 
 class CommandLine;
 
-bool DoMoo(CommandLine &CmdL);
+APT_PUBLIC bool DoMoo(CommandLine &CmdL);
 bool DoMoo1(CommandLine &CmdL);
 bool DoMoo2(CommandLine &CmdL);
 bool DoMoo3(CommandLine &CmdL);
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index 420ca14d5..7f3eef6c2 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -7,15 +7,22 @@
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/policy.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
+#include <apt-private/private-output.h>
+#include <apt-private/private-cachefile.h>
+
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <iomanip>
 #include <iostream>
-#include <locale.h>
 #include <langinfo.h>
 #include <unistd.h>
-
-#include "private-output.h"
-#include "private-cachefile.h"
+#include <signal.h>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -26,8 +33,24 @@ std::ostream c0out(0);
 std::ostream c1out(0);
 std::ostream c2out(0);
 std::ofstream devnull("/dev/null");
+
+
 unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */
 
+// SigWinch - Window size change signal handler				/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+static void SigWinch(int)
+{
+   // Riped from GNU ls
+#ifdef TIOCGWINSZ
+   struct winsize ws;
+  
+   if (ioctl(1, TIOCGWINSZ, &ws) != -1 && ws.ws_col >= 5)
+      ScreenWidth = ws.ws_col - 1;
+#endif
+}
+									/*}}}*/
 bool InitOutput()							/*{{{*/
 {
    if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
@@ -41,6 +64,10 @@ bool InitOutput()							/*{{{*/
    if (_config->FindI("quiet",0) > 1)
       c1out.rdbuf(devnull.rdbuf());
 
+   // deal with window size changes
+   signal(SIGWINCH,SigWinch);
+   SigWinch(0);
+
    if(!isatty(1))
    {
       _config->Set("APT::Color", "false");
@@ -63,7 +90,7 @@ bool InitOutput()							/*{{{*/
    return true;
 }
 									/*}}}*/
-std::string GetArchiveSuite(pkgCacheFile &CacheFile, pkgCache::VerIterator ver) /*{{{*/
+static std::string GetArchiveSuite(pkgCacheFile &/*CacheFile*/, pkgCache::VerIterator ver) /*{{{*/
 {
    std::string suite = "";
    if (ver && ver.FileList() && ver.FileList())
@@ -82,7 +109,7 @@ std::string GetArchiveSuite(pkgCacheFile &CacheFile, pkgCache::VerIterator ver)
    return suite;
 }
 									/*}}}*/
-std::string GetFlagsStr(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/
+static std::string GetFlagsStr(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/
 {
    pkgDepCache *DepCache = CacheFile.GetDepCache();
    pkgDepCache::StateCache &state = (*DepCache)[P];
@@ -99,7 +126,7 @@ std::string GetFlagsStr(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/
    return flags_str;
 }
 									/*}}}*/
-std::string GetCandidateVersion(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/
+static std::string GetCandidateVersion(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/
 {
    pkgPolicy *policy = CacheFile.GetPolicy();
    pkgCache::VerIterator cand = policy->GetCandidateVer(P);
@@ -107,14 +134,14 @@ std::string GetCandidateVersion(pkgCacheFile &CacheFile, pkgCache::PkgIterator P
    return cand ? cand.VerStr() : "(none)";
 }
 									/*}}}*/
-std::string GetInstalledVersion(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/
+static std::string GetInstalledVersion(pkgCacheFile &/*CacheFile*/, pkgCache::PkgIterator P)/*{{{*/
 {
    pkgCache::VerIterator inst = P.CurrentVer();
 
    return inst ? inst.VerStr() : "(none)";
 }
 									/*}}}*/
-std::string GetVersion(pkgCacheFile &CacheFile, pkgCache::VerIterator V)/*{{{*/
+static std::string GetVersion(pkgCacheFile &/*CacheFile*/, pkgCache::VerIterator V)/*{{{*/
 {
    pkgCache::PkgIterator P = V.ParentPkg();
    if (V == P.CurrentVer())
@@ -134,16 +161,20 @@ std::string GetVersion(pkgCacheFile &CacheFile, pkgCache::VerIterator V)/*{{{*/
    return "(none)";
 }
 									/*}}}*/
-std::string GetArchitecture(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/
+static std::string GetArchitecture(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/
 {
    pkgPolicy *policy = CacheFile.GetPolicy();
    pkgCache::VerIterator inst = P.CurrentVer();
    pkgCache::VerIterator cand = policy->GetCandidateVer(P);
-   
+
+   // this may happen for packages in dpkg "deinstall ok config-file" state
+   if (inst.IsGood() == false && cand.IsGood() == false)
+      return P.VersionList().Arch();
+
    return inst ? inst.Arch() : cand.Arch();
 }
 									/*}}}*/
-std::string GetShortDescription(pkgCacheFile &CacheFile, pkgRecords &records, pkgCache::PkgIterator P)/*{{{*/
+static std::string GetShortDescription(pkgCacheFile &CacheFile, pkgRecords &records, pkgCache::PkgIterator P)/*{{{*/
 {
    pkgPolicy *policy = CacheFile.GetPolicy();
 
diff --git a/apt-private/private-output.h b/apt-private/private-output.h
index 2a2a69458..9633d0c37 100644
--- a/apt-private/private-output.h
+++ b/apt-private/private-output.h
@@ -1,37 +1,37 @@
 #ifndef APT_PRIVATE_OUTPUT_H
 #define APT_PRIVATE_OUTPUT_H
 
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/macros.h>
 
-#include <iostream>
 #include <fstream>
 #include <string>
 
-#include "private-cachefile.h"
-
 // forward declaration
 class pkgCacheFile;
 class CacheFile;
-class pkgCache;
 class pkgDepCache;
 class pkgRecords;
 
 
-extern std::ostream c0out;
-extern std::ostream c1out;
-extern std::ostream c2out;
-extern std::ofstream devnull;
-extern unsigned int ScreenWidth;
+APT_PUBLIC extern std::ostream c0out;
+APT_PUBLIC extern std::ostream c1out;
+APT_PUBLIC extern std::ostream c2out;
+APT_PUBLIC extern std::ofstream devnull;
+APT_PUBLIC extern unsigned int ScreenWidth;
+
+APT_PUBLIC bool InitOutput();
 
-bool InitOutput();
-void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, 
+void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,
                        pkgCache::VerIterator V, std::ostream &out,
                        bool include_summary=true);
 
 
 // helper to describe global state
-bool ShowList(std::ostream &out, std::string Title, std::string List,
+APT_PUBLIC void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now);
+
+APT_PUBLIC bool ShowList(std::ostream &out, std::string Title, std::string List,
               std::string VersionsList);
-void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now);
 void ShowNew(std::ostream &out,CacheFile &Cache);
 void ShowDel(std::ostream &out,CacheFile &Cache);
 void ShowKept(std::ostream &out,CacheFile &Cache);
diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc
index 0b1a929b0..ecd5d7fad 100644
--- a/apt-private/private-search.cc
+++ b/apt-private/private-search.cc
@@ -1,40 +1,30 @@
 // Includes								/*{{{*/
-#include <apt-pkg/error.h>
+#include <config.h>
+
 #include <apt-pkg/cachefile.h>
-#include <apt-pkg/cachefilter.h>
 #include <apt-pkg/cacheset.h>
-#include <apt-pkg/init.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/sourcelist.h>
 #include <apt-pkg/cmndline.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
 #include <apt-pkg/policy.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/sptr.h>
-#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/metaindex.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
 
-#include <sstream>
-#include <utility>
-#include <cassert>
-#include <locale.h>
+#include <apt-private/private-cacheset.h>
+#include <apt-private/private-output.h>
+#include <apt-private/private-search.h>
+
+#include <string.h>
 #include <iostream>
-#include <unistd.h>
-#include <errno.h>
-#include <regex.h>
-#include <stdio.h>
-#include <iomanip>
-#include <algorithm>
+#include <sstream>
 #include <map>
+#include <string>
+#include <utility>
 
-#include "private-search.h"
-#include "private-cacheset.h"
+#include <apti18n.h>
 									/*}}}*/
 
 bool FullTextSearch(CommandLine &CmdL)					/*{{{*/
@@ -78,8 +68,12 @@ bool FullTextSearch(CommandLine &CmdL)					/*{{{*/
          const char *pattern = patterns[i];
          all_found &=  (
             strstr(V.ParentPkg().Name(), pattern) != NULL ||
-            parser.ShortDesc().find(pattern) != std::string::npos ||
-            parser.LongDesc().find(pattern) != std::string::npos);
+            strcasestr(parser.ShortDesc().c_str(), pattern) != NULL ||
+            strcasestr(parser.LongDesc().c_str(), pattern) != NULL);
+         // search patterns are AND by default so we can skip looking further
+         // on the first mismatch
+         if(all_found == false)
+            break;
       }
       if (all_found)
       {
diff --git a/apt-private/private-search.h b/apt-private/private-search.h
index 17faffebc..d4786233a 100644
--- a/apt-private/private-search.h
+++ b/apt-private/private-search.h
@@ -1,9 +1,11 @@
 #ifndef APT_PRIVATE_SEARCH_H
 #define APT_PRIVATE_SEARCH_H
 
-#include <apt-pkg/cmndline.h>
+#include <apt-pkg/macros.h>
 
-bool FullTextSearch(CommandLine &CmdL);
+class CommandLine;
+
+APT_PUBLIC bool FullTextSearch(CommandLine &CmdL);
 
 
 #endif
diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc
index 60d951316..8ae6a6dac 100644
--- a/apt-private/private-show.cc
+++ b/apt-private/private-show.cc
@@ -1,29 +1,32 @@
 // Includes								/*{{{*/
-#include <apt-pkg/error.h>
+#include <config.h>
+
 #include <apt-pkg/cachefile.h>
-#include <apt-pkg/cachefilter.h>
 #include <apt-pkg/cacheset.h>
-#include <apt-pkg/init.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/sourcelist.h>
 #include <apt-pkg/cmndline.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/indexfile.h>
 #include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/metaindex.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
 
-#include <apti18n.h>
+#include <apt-private/private-cacheset.h>
+#include <apt-private/private-output.h>
+#include <apt-private/private-show.h>
+
+#include <stdio.h>
+#include <ostream>
+#include <string>
 
-#include "private-output.h"
-#include "private-cacheset.h"
+#include <apti18n.h>
 									/*}}}*/
 
 namespace APT {
@@ -31,8 +34,8 @@ namespace APT {
 
 // DisplayRecord - Displays the complete record for the package		/*{{{*/
 // ---------------------------------------------------------------------
-bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V,
-                   ostream &out)
+static bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V,
+                   std::ostream &out)
 {
    pkgCache *Cache = CacheFile.GetPkgCache();
    if (unlikely(Cache == NULL))
@@ -96,23 +99,23 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V,
    // FIXME: add verbose that does not do the removal of the tags?
    TFRewriteData RW[] = {
       // delete, apt-cache show has this info and most users do not care
-      {"MD5sum", 0},
-      {"SHA1", 0},
-      {"SHA256", 0},
-      {"Filename", 0},
-      {"Multi-Arch", 0},
-      {"Architecture", 0},
-      {"Conffiles",0},
+      {"MD5sum", NULL, NULL},
+      {"SHA1", NULL, NULL},
+      {"SHA256", NULL, NULL},
+      {"Filename", NULL, NULL},
+      {"Multi-Arch", NULL, NULL},
+      {"Architecture", NULL, NULL},
+      {"Conffiles", NULL, NULL},
       // we use the translated description
-      {"Description",0},
-      {"Description-md5",0},
+      {"Description", NULL, NULL},
+      {"Description-md5", NULL, NULL},
       // improve
-      {"Installed-Size", installed_size.c_str(), 0},
+      {"Installed-Size", installed_size.c_str(), NULL},
       {"Size", package_size.c_str(), "Download-Size"},
       // add
-      {"APT-Manual-Installed", manual_installed, 0},
-      {"APT-Sources", source_index_file.c_str(), 0},
-      {}
+      {"APT-Manual-Installed", manual_installed, NULL},
+      {"APT-Sources", source_index_file.c_str(), NULL},
+      {NULL, NULL, NULL}
    };
 
    if(TFRewrite(stdout, Tags, NULL, RW) == false)
@@ -148,8 +151,9 @@ bool ShowPackage(CommandLine &CmdL)					/*{{{*/
    if (select == APT::VersionList::CANDIDATE)
    {
       APT::VersionList const verset_all = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionList::ALL, helper);
-      if (verset_all.size() > verset.size())
-         _error->Notice(ngettext("There is %lu additional record. Please use the '-a' switch to see it", "There are %lu additional records. Please use the '-a' switch to see them.", verset_all.size() - verset.size()), verset_all.size() - verset.size());
+      int const records = verset_all.size() - verset.size();
+      if (records > 0)
+         _error->Notice(P_("There is %i additional record. Please use the '-a' switch to see it", "There are %i additional records. Please use the '-a' switch to see them.", records), records);
    }
 
    for (APT::PackageSet::const_iterator Pkg = helper.virtualPkgs.begin();
diff --git a/apt-private/private-show.h b/apt-private/private-show.h
index b428c7af0..359aeeb28 100644
--- a/apt-private/private-show.h
+++ b/apt-private/private-show.h
@@ -1,12 +1,14 @@
 #ifndef APT_PRIVATE_SHOW_H
 #define APT_PRIVATE_SHOW_H
 
-#include <apt-pkg/cmndline.h>
+#include <apt-pkg/macros.h>
+
+class CommandLine;
 
 namespace APT {
    namespace Cmd {
 
-      bool ShowPackage(CommandLine &CmdL);
+      APT_PUBLIC bool ShowPackage(CommandLine &CmdL);
    }
 }
 #endif
diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc
index 41cf6b313..301936b9d 100644
--- a/apt-private/private-sources.cc
+++ b/apt-private/private-sources.cc
@@ -1,10 +1,23 @@
+#include <config.h>
 
 #include <apt-pkg/hashes.h>
-#include <apti18n.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+
+#include <apt-private/private-output.h>
+#include <apt-private/private-sources.h>
+#include <apt-private/private-utils.h>
 
-#include "private-output.h"
-#include "private-sources.h"
-#include "private-utils.h"
+#include <stddef.h>
+#include <unistd.h>
+#include <iostream>
+#include <string>
+
+#include <apti18n.h>
 
 /* Interface discussion with donkult (for the future):
   apt [add-{archive,release,component}|edit|change-release|disable]-sources 
diff --git a/apt-private/private-sources.h b/apt-private/private-sources.h
index b394622be..0c421902e 100644
--- a/apt-private/private-sources.h
+++ b/apt-private/private-sources.h
@@ -1,3 +1,10 @@
-#include <apt-pkg/cmndline.h>
+#ifndef APT_PRIVATE_SOURCES_H
+#define APT_PRIVATE_SOURCES_H
 
-bool EditSources(CommandLine &CmdL);
+#include <apt-pkg/macros.h>
+
+class CommandLine;
+
+APT_PUBLIC bool EditSources(CommandLine &CmdL);
+
+#endif
diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc
index f6c12c26a..da83d7741 100644
--- a/apt-private/private-update.cc
+++ b/apt-private/private-update.cc
@@ -1,37 +1,23 @@
 // Include files							/*{{{*/
 #include<config.h>
 
-#include <apt-pkg/aptconfiguration.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/cmndline.h>
-#include <apt-pkg/init.h>
-#include <apt-pkg/depcache.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/algorithms.h>
 #include <apt-pkg/acquire-item.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/clean.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
 #include <apt-pkg/cachefile.h>
-#include <apt-pkg/cacheset.h>
-#include <apt-pkg/sptr.h>
-#include <apt-pkg/md5.h>
-#include <apt-pkg/versionmatch.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/indexfile.h>
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/sourcelist.h>
 #include <apt-pkg/update.h>
+#include <apt-pkg/acquire.h>
+#include <apt-pkg/configuration.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
+#include <apt-private/acqprogress.h>
+#include <apt-private/private-cachefile.h>
+#include <apt-private/private-output.h>
+#include <apt-private/private-update.h>
 
-#include "private-cachefile.h"
-#include "private-output.h"
-#include "acqprogress.h"
+#include <ostream>
+#include <string>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-private/private-update.h b/apt-private/private-update.h
index d3d0b7af9..e584f70cf 100644
--- a/apt-private/private-update.h
+++ b/apt-private/private-update.h
@@ -1,8 +1,10 @@
 #ifndef APT_PRIVATE_UPDATE_H
 #define APT_PRIVATE_UPDATE_H
 
+#include <apt-pkg/macros.h>
+
 class CommandLine;
 
-bool DoUpdate(CommandLine &CmdL);
+APT_PUBLIC bool DoUpdate(CommandLine &CmdL);
 
 #endif
diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc
index a97e6d25b..68b2c5e00 100644
--- a/apt-private/private-upgrade.cc
+++ b/apt-private/private-upgrade.cc
@@ -1,12 +1,18 @@
-
 // Includes								/*{{{*/
-#include <apt-pkg/algorithms.h>
+#include <config.h>
+
 #include <apt-pkg/upgrade.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
+
+#include <apt-private/private-install.h>
+#include <apt-private/private-cachefile.h>
+#include <apt-private/private-upgrade.h>
+#include <apt-private/private-output.h>
+
 #include <iostream>
-#include "private-install.h"
-#include "private-cachefile.h"
-#include "private-upgrade.h"
-#include "private-output.h"
+
+#include <apti18n.h>
 									/*}}}*/
 
 // this is actually performing the various upgrade operations 
diff --git a/apt-private/private-upgrade.h b/apt-private/private-upgrade.h
index 5efc66bf7..16bb93c9b 100644
--- a/apt-private/private-upgrade.h
+++ b/apt-private/private-upgrade.h
@@ -1,13 +1,13 @@
 #ifndef APTPRIVATE_PRIVATE_UPGRADE_H
 #define APTPRIVATE_PRIVATE_UPGRADE_H
 
-#include <apt-pkg/cmndline.h>
+#include <apt-pkg/macros.h>
 
+class CommandLine;
 
-bool DoDistUpgrade(CommandLine &CmdL);
-bool DoUpgrade(CommandLine &CmdL);
+APT_PUBLIC bool DoDistUpgrade(CommandLine &CmdL);
+APT_PUBLIC bool DoUpgrade(CommandLine &CmdL);
 bool DoUpgradeNoNewPackages(CommandLine &CmdL);
 bool DoUpgradeWithAllowNewPackages(CommandLine &CmdL);
 
-
 #endif
diff --git a/apt-private/private-utils.cc b/apt-private/private-utils.cc
index 813f19329..9547a1b75 100644
--- a/apt-private/private-utils.cc
+++ b/apt-private/private-utils.cc
@@ -1,9 +1,12 @@
-#include <cstdlib>
+#include <config.h>
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>
-#include "private-utils.h"
 
+#include <apt-private/private-utils.h>
+
+#include <cstdlib>
+#include <unistd.h>
 
 // DisplayFileInPager - Display File with pager        			/*{{{*/
 void DisplayFileInPager(std::string filename)
@@ -26,7 +29,6 @@ void DisplayFileInPager(std::string filename)
    ExecWait(Process, "sensible-pager", false);
 }
 									/*}}}*/
-
 // EditFileInSensibleEditor - Edit File with editor    			/*{{{*/
 void EditFileInSensibleEditor(std::string filename)
 {
diff --git a/apt-private/private-utils.h b/apt-private/private-utils.h
index 258dd06a8..432699787 100644
--- a/apt-private/private-utils.h
+++ b/apt-private/private-utils.h
@@ -1,11 +1,11 @@
 #ifndef APT_PRIVATE_UTILS_H
 #define APT_PRIVATE_UTILS_H
 
-#include<string>
-
-void DisplayFileInPager(std::string filename);
-void EditFileInSensibleEditor(std::string filename);
+#include <apt-pkg/macros.h>
 
+#include <string>
 
+APT_PUBLIC void DisplayFileInPager(std::string filename);
+APT_PUBLIC void EditFileInSensibleEditor(std::string filename);
 
 #endif
diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in
index a9d48dd97..2202c5b19 100644
--- a/buildlib/apti18n.h.in
+++ b/buildlib/apti18n.h.in
@@ -8,7 +8,8 @@
 
 #ifdef USE_NLS
 // apt will use the gettext implementation of the C library
-# include <libintl.h>
+#include <libintl.h>
+#include <locale.h>
 # ifdef APT_DOMAIN
 #   define _(x) dgettext(APT_DOMAIN,x)
 #   define P_(msg,plural,n) dngettext(APT_DOMAIN,msg,plural,n)
diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index bd43a40b9..6b72fb393 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -11,6 +11,9 @@
 /* Define if we have the bz2 library for bzip2 */
 #undef HAVE_BZ2
 
+/* Define if we have the lzma library for lzma/xz */
+#undef HAVE_LZMA
+
 /* These two are used by the statvfs shim for glibc2.0 and bsd */
 /* Define if we have sys/vfs.h */
 #undef HAVE_VFS_H
@@ -42,3 +45,4 @@
 
 #define APT_8_CLEANER_HEADERS
 #define APT_9_CLEANER_HEADERS
+#define APT_10_CLEANER_HEADERS
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index fc859951e..c1bf29672 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -7,9 +7,13 @@ PACKAGE_MAIL = @PACKAGE_MAIL@
 
 # C++ compiler options
 CC = @CC@
-CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -Wall
+CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -D_FORTIFY_SOURCE=2
 CXX = @CXX@
-CXXFLAGS+= @CXXFLAGS@
+CXXFLAGS+= @CXXFLAGS@ -Wall -Wextra
+CXXFLAGS+= -Wcast-align -Wlogical-op -Wredundant-decls -Wmissing-declarations -Wunsafe-loop-optimizations
+CXXFLAGS+= -Wsuggest-attribute=pure -Wsuggest-attribute=const -Wsuggest-attribute=noreturn
+# a bit too pedantic to be run by default
+#CXXFLAGS+= -Wpedantic -Wno-long-long -Wno-vla -Wno-variadic-macros
 NUM_PROCS = @NUM_PROCS@
 
 # Linker stuff
@@ -57,6 +61,7 @@ INTLLIBS = @INTLLIBS@
 HAVE_STATVFS = @HAVE_STATVFS@
 HAVE_ZLIB = @HAVE_ZLIB@
 HAVE_BZ2 = @HAVE_BZ2@
+HAVE_LZMA = @HAVE_LZMA@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
 
 # Shared library things
@@ -68,4 +73,3 @@ else
    # Do not know how to create shared libraries here.
    ONLYSTATICLIBS = yes
 endif
-	
diff --git a/buildlib/library.mak b/buildlib/library.mak
index ef1306b66..cc0286d7e 100644
--- a/buildlib/library.mak
+++ b/buildlib/library.mak
@@ -63,7 +63,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS)
 	echo Compiling $< to $@
-	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $<
+	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $(abspath $<)
 	$(DoDep)
 
 # Include the dependencies that are available
diff --git a/buildlib/libversion.mak b/buildlib/libversion.mak
index 796c956e7..deb3da377 100644
--- a/buildlib/libversion.mak
+++ b/buildlib/libversion.mak
@@ -2,9 +2,9 @@
 # Version number of libapt-pkg.
 # Please increase MAJOR with each ABI break,
 # with each non-ABI break to the lib, please increase RELEASE.
-# The versionnumber is extracted from apt-pkg/init.h - see also there.
-LIBAPTPKG_MAJOR=$(shell awk -v ORS='.' '/^\#define APT_PKG_M/ {print $$3}' $(BASE)/apt-pkg/init.h | sed 's/\.$$//')
-LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/init.h | cut -d ' ' -f 3)
+# The versionnumber is extracted from apt-pkg/macros.h - see also there.
+LIBAPTPKG_MAJOR=$(shell awk -v ORS='.' '/^\#define APT_PKG_M/ {print $$3}' $(BASE)/apt-pkg/contrib/macros.h | sed 's/\.$$//')
+LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/contrib/macros.h | cut -d ' ' -f 3)
 
 # Version number of libapt-inst
 # Please increase MAJOR with each ABI break,
diff --git a/buildlib/program.mak b/buildlib/program.mak
index da538f5eb..71c265f39 100644
--- a/buildlib/program.mak
+++ b/buildlib/program.mak
@@ -50,7 +50,7 @@ $($(LOCAL)-BIN): $($(LOCAL)-OBJS) $($(LOCAL)-MKS)
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.o: %.cc
 	echo Compiling $< to $@
-	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
+	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(abspath $<)
 	$(DoDep)
 
 # Include the dependencies that are available
diff --git a/buildlib/python.mak b/buildlib/python.mak
index 02345c2d2..f08ab5563 100644
--- a/buildlib/python.mak
+++ b/buildlib/python.mak
@@ -58,7 +58,7 @@ endif  # ifdef PYTHONLIB
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.opic: %.cc
 	echo Compiling $< to $@
-	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $<
+	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $(abspath $<)
 	$(DoDep)
 
 # Include the dependencies that are available
diff --git a/buildlib/staticlibrary.mak b/buildlib/staticlibrary.mak
index ce9259dc0..86908700f 100644
--- a/buildlib/staticlibrary.mak
+++ b/buildlib/staticlibrary.mak
@@ -50,7 +50,7 @@ endif
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.o: %.cc
 	echo Compiling $< to $@
-	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
+	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(abspath $<)
 	$(DoDep)
 
 # Include the dependencies that are available
diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
deleted file mode 100644
index 3ac350aca..000000000
--- a/cmdline/acqprogress.cc
+++ /dev/null
@@ -1,304 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/
-// $Id: acqprogress.cc,v 1.24 2003/04/27 01:56:48 doogie Exp $
-/* ######################################################################
-
-   Acquire Progress - Command line progress meter 
-   
-   ##################################################################### */
-									/*}}}*/
-// Include files							/*{{{*/
-#include<config.h>
-
-#include <apt-pkg/acquire-item.h>
-#include <apt-pkg/acquire-worker.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/error.h>
-
-#include <stdio.h>
-#include <signal.h>
-#include <iostream>
-#include <unistd.h>
-
-#include "acqprogress.h"
-#include <apti18n.h>
-									/*}}}*/
-
-using namespace std;
-
-// AcqTextStatus::AcqTextStatus - Constructor				/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet) :
-    ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet)
-{
-   BlankLine[0] = 0;
-}
-									/*}}}*/
-// AcqTextStatus::Start - Downloading has started			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void AcqTextStatus::Start() 
-{
-   pkgAcquireStatus::Start(); 
-   BlankLine[0] = 0;
-   ID = 1;
-};
-									/*}}}*/
-// AcqTextStatus::IMSHit - Called when an item got a HIT response	/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
-{
-   if (Quiet > 1)
-      return;
-
-   if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r';   
-   
-   cout << _("Hit ") << Itm.Description;
-   if (Itm.Owner->FileSize != 0)
-      cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
-   cout << endl;
-   Update = true;
-};
-									/*}}}*/
-// AcqTextStatus::Fetch - An item has started to download		/*{{{*/
-// ---------------------------------------------------------------------
-/* This prints out the short description and the expected size */
-void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
-{
-   Update = true;
-   if (Itm.Owner->Complete == true)
-      return;
-   
-   Itm.Owner->ID = ID++;
-   
-   if (Quiet > 1)
-      return;
-
-   if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r';
-   
-   cout << _("Get:") << Itm.Owner->ID << ' ' << Itm.Description;
-   if (Itm.Owner->FileSize != 0)
-      cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
-   cout << endl;
-};
-									/*}}}*/
-// AcqTextStatus::Done - Completed a download				/*{{{*/
-// ---------------------------------------------------------------------
-/* We don't display anything... */
-void AcqTextStatus::Done(pkgAcquire::ItemDesc &Itm)
-{
-   Update = true;
-};
-									/*}}}*/
-// AcqTextStatus::Fail - Called when an item fails to download		/*{{{*/
-// ---------------------------------------------------------------------
-/* We print out the error text  */
-void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
-{
-   if (Quiet > 1)
-      return;
-
-   // Ignore certain kinds of transient failures (bad code)
-   if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
-      return;
-      
-   if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r';
-   
-   if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
-   {
-      cout << _("Ign ") << Itm.Description << endl;
-   }
-   else
-   {
-      cout << _("Err ") << Itm.Description << endl;
-      cout << "  " << Itm.Owner->ErrorText << endl;
-   }
-   
-   Update = true;
-};
-									/*}}}*/
-// AcqTextStatus::Stop - Finished downloading				/*{{{*/
-// ---------------------------------------------------------------------
-/* This prints out the bytes downloaded and the overall average line
-   speed */
-void AcqTextStatus::Stop()
-{
-   pkgAcquireStatus::Stop();
-   if (Quiet > 1)
-      return;
-
-   if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r' << flush;
-
-   if (FetchedBytes != 0 && _error->PendingError() == false)
-      ioprintf(cout,_("Fetched %sB in %s (%sB/s)\n"),
-	       SizeToStr(FetchedBytes).c_str(),
-	       TimeToStr(ElapsedTime).c_str(),
-	       SizeToStr(CurrentCPS).c_str());
-}
-									/*}}}*/
-// AcqTextStatus::Pulse - Regular event pulse				/*{{{*/
-// ---------------------------------------------------------------------
-/* This draws the current progress. Each line has an overall percent
-   meter and a per active item status meter along with an overall 
-   bandwidth and ETA indicator. */
-bool AcqTextStatus::Pulse(pkgAcquire *Owner)
-{
-   pkgAcquireStatus::Pulse(Owner);
-   
-   if (Quiet > 0)
-      return true;
-   
-   enum {Long = 0,Medium,Short} Mode = Medium;
-   
-   char Buffer[sizeof(BlankLine)];
-   char *End = Buffer + sizeof(Buffer);
-   char *S = Buffer;
-   if (ScreenWidth >= sizeof(Buffer))
-      ScreenWidth = sizeof(Buffer)-1;
-
-   // Put in the percent done
-   sprintf(S,"%.0f%%",((CurrentBytes + CurrentItems)*100.0)/(TotalBytes+TotalItems));
-
-   bool Shown = false;
-   for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
-	I = Owner->WorkerStep(I))
-   {
-      S += strlen(S);
-      
-      // There is no item running 
-      if (I->CurrentItem == 0)
-      {
-	 if (I->Status.empty() == false)
-	 {
-	    snprintf(S,End-S," [%s]",I->Status.c_str());
-	    Shown = true;
-	 }
-	 
-	 continue;
-      }
-
-      Shown = true;
-      
-      // Add in the short description
-      if (I->CurrentItem->Owner->ID != 0)
-	 snprintf(S,End-S," [%lu %s",I->CurrentItem->Owner->ID,
-		  I->CurrentItem->ShortDesc.c_str());
-      else
-	 snprintf(S,End-S," [%s",I->CurrentItem->ShortDesc.c_str());
-      S += strlen(S);
-
-      // Show the short mode string
-      if (I->CurrentItem->Owner->Mode != 0)
-      {
-	 snprintf(S,End-S," %s",I->CurrentItem->Owner->Mode);
-	 S += strlen(S);
-      }
-            
-      // Add the current progress
-      if (Mode == Long)
-	 snprintf(S,End-S," %llu",I->CurrentSize);
-      else
-      {
-	 if (Mode == Medium || I->TotalSize == 0)
-	    snprintf(S,End-S," %sB",SizeToStr(I->CurrentSize).c_str());
-      }
-      S += strlen(S);
-      
-      // Add the total size and percent
-      if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false)
-      {
-	 if (Mode == Short)
-	    snprintf(S,End-S," %.0f%%",
-		     (I->CurrentSize*100.0)/I->TotalSize);
-	 else
-	    snprintf(S,End-S,"/%sB %.0f%%",SizeToStr(I->TotalSize).c_str(),
-		     (I->CurrentSize*100.0)/I->TotalSize);
-      }      
-      S += strlen(S);
-      snprintf(S,End-S,"]");
-   }
-
-   // Show something..
-   if (Shown == false)
-      snprintf(S,End-S,_(" [Working]"));
-      
-   /* Put in the ETA and cps meter, block off signals to prevent strangeness
-      during resizing */
-   sigset_t Sigs,OldSigs;
-   sigemptyset(&Sigs);
-   sigaddset(&Sigs,SIGWINCH);
-   sigprocmask(SIG_BLOCK,&Sigs,&OldSigs);
-   
-   if (CurrentCPS != 0)
-   {      
-      char Tmp[300];
-      unsigned long long ETA = (TotalBytes - CurrentBytes)/CurrentCPS;
-      sprintf(Tmp," %sB/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
-      unsigned int Len = strlen(Buffer);
-      unsigned int LenT = strlen(Tmp);
-      if (Len + LenT < ScreenWidth)
-      {	 
-	 memset(Buffer + Len,' ',ScreenWidth - Len);
-	 strcpy(Buffer + ScreenWidth - LenT,Tmp);
-      }      
-   }
-   Buffer[ScreenWidth] = 0;
-   BlankLine[ScreenWidth] = 0;
-   sigprocmask(SIG_SETMASK,&OldSigs,0);
-
-   // Draw the current status
-   if (strlen(Buffer) == strlen(BlankLine))
-      cout << '\r' << Buffer << flush;
-   else
-      cout << '\r' << BlankLine << '\r' << Buffer << flush;
-   memset(BlankLine,' ',strlen(Buffer));
-   BlankLine[strlen(Buffer)] = 0;
-   
-   Update = false;
-
-   return true;
-}
-									/*}}}*/
-// AcqTextStatus::MediaChange - Media need to be swapped		/*{{{*/
-// ---------------------------------------------------------------------
-/* Prompt for a media swap */
-bool AcqTextStatus::MediaChange(string Media,string Drive)
-{
-   // If we do not output on a terminal and one of the options to avoid user
-   // interaction is given, we assume that no user is present who could react
-   // on your media change request
-   if (isatty(STDOUT_FILENO) != 1 && Quiet >= 2 &&
-       (_config->FindB("APT::Get::Assume-Yes",false) == true ||
-	_config->FindB("APT::Get::Force-Yes",false) == true ||
-	_config->FindB("APT::Get::Trivial-Only",false) == true))
-
-      return false;
-
-   if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r';
-   ioprintf(cout,_("Media change: please insert the disc labeled\n"
-		   " '%s'\n"
-		   "in the drive '%s' and press enter\n"),
-	    Media.c_str(),Drive.c_str());
-
-   char C = 0;
-   bool bStatus = true;
-   while (C != '\n' && C != '\r')
-   {
-      int len = read(STDIN_FILENO,&C,1);
-      if(C == 'c' || len <= 0)
-	 bStatus = false;
-   }
-
-   if(bStatus)
-      Update = true;
-   return bStatus;
-}
-									/*}}}*/
diff --git a/cmdline/acqprogress.h b/cmdline/acqprogress.h
deleted file mode 100644
index 8f0903923..000000000
--- a/cmdline/acqprogress.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/
-// $Id: acqprogress.h,v 1.5 2003/02/02 22:24:11 jgg Exp $
-/* ######################################################################
-
-   Acquire Progress - Command line progress meter 
-   
-   ##################################################################### */
-									/*}}}*/
-#ifndef ACQPROGRESS_H
-#define ACQPROGRESS_H
-
-#include <apt-pkg/acquire.h>
-
-#include <string>
-
-class AcqTextStatus : public pkgAcquireStatus
-{
-   unsigned int &ScreenWidth;
-   char BlankLine[1024];
-   unsigned long ID;
-   unsigned long Quiet;
-   
-   public:
-   
-   virtual bool MediaChange(std::string Media,std::string Drive);
-   virtual void IMSHit(pkgAcquire::ItemDesc &Itm);
-   virtual void Fetch(pkgAcquire::ItemDesc &Itm);
-   virtual void Done(pkgAcquire::ItemDesc &Itm);
-   virtual void Fail(pkgAcquire::ItemDesc &Itm);
-   virtual void Start();
-   virtual void Stop();
-   
-   bool Pulse(pkgAcquire *Owner);
-
-   AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet);
-};
-
-#endif
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index b8892d23d..84b775390 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -15,40 +15,49 @@
 // Include Files							/*{{{*/
 #include<config.h>
 
-#include <apt-pkg/error.h>
+#include <apt-pkg/algorithms.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cacheset.h>
-#include <apt-pkg/init.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/sourcelist.h>
 #include <apt-pkg/cmndline.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/metaindex.h>
 #include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
+#include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/policy.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/algorithms.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/sourcelist.h>
 #include <apt-pkg/sptr.h>
-#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/metaindex.h>
+#include <apt-pkg/srcrecords.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/version.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
 
-#include <apt-private/private-list.h>
-#include <apt-private/private-cmndline.h>
-#include <apt-private/private-show.h>
 #include <apt-private/private-cacheset.h>
+#include <apt-private/private-cmndline.h>
 
-#include <cassert>
-#include <locale.h>
-#include <iostream>
-#include <unistd.h>
-#include <errno.h>
 #include <regex.h>
+#include <stddef.h>
 #include <stdio.h>
-#include <iomanip>
+#include <stdlib.h>
+#include <unistd.h>
 #include <algorithm>
+#include <cstring>
+#include <iomanip>
+#include <iostream>
+#include <list>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -58,7 +67,7 @@ using namespace std;
 // LocalitySort - Sort a version list by package file locality		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-int LocalityCompare(const void *a, const void *b)
+static int LocalityCompare(const void *a, const void *b)
 {
    pkgCache::VerFile *A = *(pkgCache::VerFile **)a;
    pkgCache::VerFile *B = *(pkgCache::VerFile **)b;
@@ -75,13 +84,13 @@ int LocalityCompare(const void *a, const void *b)
    return A->File - B->File;
 }
 
-void LocalitySort(pkgCache::VerFile **begin,
+static void LocalitySort(pkgCache::VerFile **begin,
 		  unsigned long Count,size_t Size)
 {   
    qsort(begin,Count,Size,LocalityCompare);
 }
 
-void LocalitySort(pkgCache::DescFile **begin,
+static void LocalitySort(pkgCache::DescFile **begin,
 		  unsigned long Count,size_t Size)
 {   
    qsort(begin,Count,Size,LocalityCompare);
@@ -90,7 +99,7 @@ void LocalitySort(pkgCache::DescFile **begin,
 // UnMet - Show unmet dependencies					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ShowUnMet(pkgCache::VerIterator const &V, bool const Important)
+static bool ShowUnMet(pkgCache::VerIterator const &V, bool const Important)
 {
 	 bool Header = false;
 	 for (pkgCache::DepIterator D = V.DependsList(); D.end() == false;)
@@ -163,7 +172,7 @@ bool ShowUnMet(pkgCache::VerIterator const &V, bool const Important)
 	 }
    return true;
 }
-bool UnMet(CommandLine &CmdL)
+static bool UnMet(CommandLine &CmdL)
 {
    bool const Important = _config->FindB("APT::Cache::Important",false);
 
@@ -193,7 +202,7 @@ bool UnMet(CommandLine &CmdL)
 // DumpPackage - Show a dump of a package record			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool DumpPackage(CommandLine &CmdL)
+static bool DumpPackage(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);
@@ -258,7 +267,7 @@ bool DumpPackage(CommandLine &CmdL)
 // Stats - Dump some nice statistics					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool Stats(CommandLine &Cmd)
+static bool Stats(CommandLine &)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -371,7 +380,7 @@ bool Stats(CommandLine &Cmd)
 // Dump - show everything						/*{{{*/
 // ---------------------------------------------------------------------
 /* This is worthless except fer debugging things */
-bool Dump(CommandLine &Cmd)
+static bool Dump(CommandLine &)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -423,7 +432,7 @@ bool Dump(CommandLine &Cmd)
 // ---------------------------------------------------------------------
 /* This is needed to make dpkg --merge happy.. I spent a bit of time to 
    make this run really fast, perhaps I went a little overboard.. */
-bool DumpAvail(CommandLine &Cmd)
+static bool DumpAvail(CommandLine &)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -532,7 +541,7 @@ bool DumpAvail(CommandLine &Cmd)
 	 if ((File->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource)
 	 {
 	    pkgTagSection Tags;
-	    TFRewriteData RW[] = {{"Status",0},{"Config-Version",0},{}};
+	    TFRewriteData RW[] = {{"Status", NULL, NULL},{"Config-Version", NULL, NULL},{NULL, NULL, NULL}};
 	    const char *Zero = 0;
 	    if (Tags.Scan(Buffer+Jitter,VF.Size+1) == false ||
 		TFRewrite(stdout,Tags,&Zero,RW) == false)
@@ -562,7 +571,7 @@ bool DumpAvail(CommandLine &Cmd)
 }
 									/*}}}*/
 // ShowDepends - Helper for printing out a dependency tree		/*{{{*/
-bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
+static bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -676,7 +685,7 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
 // Depends - Print out a dependency tree				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool Depends(CommandLine &CmdL)
+static bool Depends(CommandLine &CmdL)
 {
    return ShowDepends(CmdL, false);
 }
@@ -684,7 +693,7 @@ bool Depends(CommandLine &CmdL)
 // RDepends - Print out a reverse dependency tree			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool RDepends(CommandLine &CmdL)
+static bool RDepends(CommandLine &CmdL)
 {
    return ShowDepends(CmdL, true);
 }
@@ -693,7 +702,7 @@ bool RDepends(CommandLine &CmdL)
 // ---------------------------------------------------------------------
 // Code contributed from Junichi Uekawa <dancer@debian.org> on 20 June 2002.
 
-bool XVcg(CommandLine &CmdL)
+static bool XVcg(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -905,7 +914,7 @@ bool XVcg(CommandLine &CmdL)
 /* Dotty is the graphvis program for generating graphs. It is a fairly
    simple queuing algorithm that just writes dependencies and nodes. 
    http://www.research.att.com/sw/tools/graphviz/ */
-bool Dotty(CommandLine &CmdL)
+static bool Dotty(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -1109,7 +1118,7 @@ bool Dotty(CommandLine &CmdL)
 /* This displays the package record from the proper package index file. 
    It is not used by DumpAvail for performance reasons. */
 
-static unsigned char const* skipDescriptionFields(unsigned char const * DescP)
+static APT_PURE unsigned char const* skipDescriptionFields(unsigned char const * DescP)
 {
    char const * const TagName = "\nDescription";
    size_t const TagLen = strlen(TagName);
@@ -1126,7 +1135,7 @@ static unsigned char const* skipDescriptionFields(unsigned char const * DescP)
       ++DescP;
    return DescP;
 }
-bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
+static bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
 {
    pkgCache *Cache = CacheFile.GetPkgCache();
    if (unlikely(Cache == NULL))
@@ -1228,7 +1237,7 @@ struct ExDescFile
 // Search - Perform a search						/*{{{*/
 // ---------------------------------------------------------------------
 /* This searches the package names and package descriptions for a pattern */
-bool Search(CommandLine &CmdL)
+static bool Search(CommandLine &CmdL)
 {
    bool const ShowFull = _config->FindB("APT::Cache::ShowFull",false);
    bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly",false);
@@ -1388,7 +1397,7 @@ bool Search(CommandLine &CmdL)
 }
 									/*}}}*/
 /* ShowAuto - show automatically installed packages (sorted)		{{{*/
-bool ShowAuto(CommandLine &CmdL)
+static bool ShowAuto(CommandLine &)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -1415,7 +1424,7 @@ bool ShowAuto(CommandLine &CmdL)
 // ShowPackage - Dump the package record to the screen			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ShowPackage(CommandLine &CmdL)
+static bool ShowPackage(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    CacheSetHelperVirtuals helper(true, GlobalError::NOTICE);
@@ -1439,7 +1448,7 @@ bool ShowPackage(CommandLine &CmdL)
 // ShowPkgNames - Show package names					/*{{{*/
 // ---------------------------------------------------------------------
 /* This does a prefix match on the first argument */
-bool ShowPkgNames(CommandLine &CmdL)
+static bool ShowPkgNames(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    if (unlikely(CacheFile.BuildCaches(NULL, false) == false))
@@ -1478,7 +1487,7 @@ bool ShowPkgNames(CommandLine &CmdL)
 // ShowSrcPackage - Show source package records				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ShowSrcPackage(CommandLine &CmdL)
+static bool ShowSrcPackage(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    pkgSourceList *List = CacheFile.GetSourceList();
@@ -1515,7 +1524,7 @@ bool ShowSrcPackage(CommandLine &CmdL)
 // Policy - Show the results of the preferences file			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool Policy(CommandLine &CmdL)
+static bool Policy(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -1644,7 +1653,7 @@ bool Policy(CommandLine &CmdL)
 // Madison - Look a bit like katie's madison				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool Madison(CommandLine &CmdL)
+static bool Madison(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    pkgSourceList *SrcList = CacheFile.GetSourceList();
@@ -1717,7 +1726,7 @@ bool Madison(CommandLine &CmdL)
 // GenCaches - Call the main cache generator				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool GenCaches(CommandLine &Cmd)
+static bool GenCaches(CommandLine &)
 {
    OpTextProgress Progress(*_config);
 
@@ -1728,7 +1737,7 @@ bool GenCaches(CommandLine &Cmd)
 // ShowHelp - Show a help screen					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ShowHelp(CommandLine &Cmd)
+static bool ShowHelp(CommandLine &)
 {
    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 20c6e8892..53efe65b8 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -20,33 +20,20 @@
 #include <apt-pkg/progress.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/strutl.h>
-#include <apt-pkg/acquire.h>
-#include <apt-pkg/acquire-item.h>
 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgsystem.h>
 
-#include <locale.h>
 #include <iostream>
-#include <fstream>
 #include <vector>
-#include <algorithm>
+#include <string>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
 #include <unistd.h>
-#include <stdio.h>
 
 #include <apt-private/private-cmndline.h>
 
 #include <apti18n.h>
 									/*}}}*/
-static const char *W_NO_CDROM_FOUND = \
-   N_("No CD-ROM could be auto-detected or found using "
-      "the default mount point.\n"
-      "You may try the --cdrom option to set the CD-ROM mount point. "
-      "See 'man apt-cdrom' for more "
-      "information about the CD-ROM auto-detection and mount point.");
 
 using namespace std;
 
@@ -54,7 +41,7 @@ class pkgCdromTextStatus : public pkgCdromStatus			/*{{{*/
 {
 protected:
    OpTextProgress Progress;
-   void Prompt(const char *Text); 
+   void Prompt(const char *Text);
    string PromptLine(const char *Text);
    bool AskCdromName(string &name);
 
@@ -64,12 +51,12 @@ public:
    virtual OpProgress* GetOpProgress();
 };
 
-void pkgCdromTextStatus::Prompt(const char *Text) 
+void pkgCdromTextStatus::Prompt(const char *Text)
 {
    char C;
    cout << Text << ' ' << flush;
    if (read(STDIN_FILENO,&C,1) < 0)
-      _error->Errno("pkgCdromTextStatus::Prompt", 
+      _error->Errno("pkgCdromTextStatus::Prompt",
                     "Failed to read from standard input (not a terminal?)");
    if (C != '\n')
       cout << endl;
@@ -78,176 +65,144 @@ void pkgCdromTextStatus::Prompt(const char *Text)
 string pkgCdromTextStatus::PromptLine(const char *Text)
 {
    cout << Text << ':' << endl;
-   
+
    string Res;
    getline(cin,Res);
    return Res;
 }
 
-bool pkgCdromTextStatus::AskCdromName(string &name) 
+bool pkgCdromTextStatus::AskCdromName(string &name)
 {
    cout << _("Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'") << flush;
    name = PromptLine("");
-	 
+
    return true;
 }
-   
 
-void pkgCdromTextStatus::Update(string text, int current) 
+
+void pkgCdromTextStatus::Update(string text, int /*current*/)
 {
    if(text.size() > 0)
       cout << text << flush;
 }
 
-bool pkgCdromTextStatus::ChangeCdrom() 
+bool pkgCdromTextStatus::ChangeCdrom()
 {
    Prompt(_("Please insert a Disc in the drive and press enter"));
    return true;
 }
 
-OpProgress* pkgCdromTextStatus::GetOpProgress() 
-{ 
-   return &Progress; 
-};
-									/*}}}*/
-// SetupAutoDetect       						/*{{{*/
-bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i, bool &automounted)
+APT_CONST OpProgress* pkgCdromTextStatus::GetOpProgress()
 {
-   bool Debug =  _config->FindB("Debug::Acquire::cdrom", false);
-
-   automounted = false;
-
-   vector<struct CdromDevice> v = UdevCdroms.Scan();
-   if (i >= v.size())
-      return false;
-
-   if (Debug)
-      clog << "Looking at devce " << i
-	   << " DeviveName: " << v[i].DeviceName 
-	   << " IsMounted: '" << v[i].Mounted << "'"
-	   << " MountPoint: '" << v[i].MountPath << "'"
-	   << endl;
-
-   if (v[i].Mounted)
-   {
-      // set the right options
-      _config->Set("Acquire::cdrom::mount", v[i].MountPath);
-      _config->Set("APT::CDROM::NoMount", true);
-   } else {
-      string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
-      if (!FileExists(AptMountPoint))
-	 mkdir(AptMountPoint.c_str(), 0750);
-      if(MountCdrom(AptMountPoint, v[i].DeviceName) == false)
-	 _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint.c_str());
-      else
-	 automounted = true;
-      _config->Set("Acquire::cdrom::mount", AptMountPoint);
-      _config->Set("APT::CDROM::NoMount", true);
-   }
-   i++;
-
-   return true;
+   return &Progress;
 }
 									/*}}}*/
-// DoAdd - Add a new CDROM						/*{{{*/
-// ---------------------------------------------------------------------
-/* This does the main add bit.. We show some status and things. The
-   sequence is to mount/umount the CD, Ident it then scan it for package 
-   files and reduce that list. Then we copy over the package files and
-   verify them. Then rewrite the database files */
-bool DoAdd(CommandLine &)
+// AddOrIdent - Add or Ident a CDROM					/*{{{*/
+static bool AddOrIdent(bool const Add)
 {
    pkgUdevCdromDevices UdevCdroms;
    pkgCdromTextStatus log;
    pkgCdrom cdrom;
-   bool res = true;
 
+   bool oneSuccessful = false;
    bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);
-   unsigned int count = 0;
-   string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
-   bool automounted = false;
-   if (AutoDetect && UdevCdroms.Dlopen())
-      while (AutoDetectCdrom(UdevCdroms, count, automounted)) {
-	 if (count == 1) {
-	    // begin loop with res false to detect any success using OR
-	    res = false;
+   if (AutoDetect == true && UdevCdroms.Dlopen() == true)
+   {
+      bool const Debug = _config->FindB("Debug::Acquire::cdrom", false);
+      std::string const CDMount = _config->Find("Acquire::cdrom::mount");
+      bool const NoMount = _config->FindB("APT::CDROM::NoMount", false);
+      if (NoMount == false)
+	 _config->Set("APT::CDROM::NoMount", true);
+
+      vector<struct CdromDevice> const v = UdevCdroms.Scan();
+      for (std::vector<struct CdromDevice>::const_iterator cd = v.begin(); cd != v.end(); ++cd)
+      {
+	 if (Debug)
+	    clog << "Looking at device:"
+	       << "\tDeviveName: '" << cd->DeviceName << "'"
+	       << "\tIsMounted: '" << cd->Mounted << "'"
+	       << "\tMountPoint: '" << cd->MountPath << "'"
+	       << endl;
+
+	 std::string AptMountPoint;
+	 if (cd->Mounted)
+	    _config->Set("Acquire::cdrom::mount", cd->MountPath);
+	 else if (NoMount == true)
+	    continue;
+	 else
+	 {
+	    AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+	    if (FileExists(AptMountPoint) == false)
+	       mkdir(AptMountPoint.c_str(), 0750);
+	    if(MountCdrom(AptMountPoint, cd->DeviceName) == false)
+	    {
+	       _error->Warning(_("Failed to mount '%s' to '%s'"), cd->DeviceName.c_str(), AptMountPoint.c_str());
+	       continue;
+	    }
+	    _config->Set("Acquire::cdrom::mount", AptMountPoint);
 	 }
 
-	 // dump any warnings/errors from autodetect
-	 if (_error->empty() == false)
-	    _error->DumpErrors();
-
-	 res |= cdrom.Add(&log);
+	 _error->PushToStack();
+	 if (Add == true)
+	    oneSuccessful = cdrom.Add(&log);
+	 else
+	 {
+	    std::string id;
+	    oneSuccessful = cdrom.Ident(id, &log);
+	 }
+	 _error->MergeWithStack();
 
-	 if (automounted)
+	 if (AptMountPoint.empty() == false)
 	    UnmountCdrom(AptMountPoint);
-
-	 // dump any warnings/errors from add/unmount
-	 if (_error->empty() == false)
-	    _error->DumpErrors();
       }
+      if (NoMount == false)
+	 _config->Set("APT::CDROM::NoMount", NoMount);
+      _config->Set("Acquire::cdrom::mount", CDMount);
+   }
 
-   if (count == 0)
-      res = cdrom.Add(&log);
+   // fallback if auto-detect didn't work
+   if (oneSuccessful == false)
+   {
+      _error->PushToStack();
+      if (Add == true)
+	 oneSuccessful = cdrom.Add(&log);
+      else
+      {
+	 std::string id;
+	 oneSuccessful = cdrom.Ident(id, &log);
+      }
+      _error->MergeWithStack();
+   }
 
-   if (res == false)
-      _error->Error("%s", _(W_NO_CDROM_FOUND));
-   else
+   if (oneSuccessful == false)
+      _error->Error("%s", _("No CD-ROM could be auto-detected or found using the default mount point.\n"
+      "You may try the --cdrom option to set the CD-ROM mount point.\n"
+      "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and mount point."));
+   else if (Add == true)
       cout << _("Repeat this process for the rest of the CDs in your set.") << endl;
 
-   return res;
+   return oneSuccessful;
 }
 									/*}}}*/
-// DoIdent - Ident a CDROM						/*{{{*/
+// DoAdd - Add a new CDROM						/*{{{*/
 // ---------------------------------------------------------------------
-/* */
-bool DoIdent(CommandLine &)
+/* This does the main add bit.. We show some status and things. The
+   sequence is to mount/umount the CD, Ident it then scan it for package
+   files and reduce that list. Then we copy over the package files and
+   verify them. Then rewrite the database files */
+static bool DoAdd(CommandLine &)
 {
-   pkgUdevCdromDevices UdevCdroms;
-   string ident;
-   pkgCdromTextStatus log;
-   pkgCdrom cdrom;
-   bool res = true;
-
-   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);
-
-   unsigned int count = 0;
-   string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
-   bool automounted = false;
-   if (AutoDetect && UdevCdroms.Dlopen())
-      while (AutoDetectCdrom(UdevCdroms, count, automounted)) {
-	 if (count == 1) {
-	    // begin loop with res false to detect any success using OR
-	    res = false;
-	 }
-
-	 // dump any warnings/errors from autodetect
-	 if (_error->empty() == false)
-	    _error->DumpErrors();
-
-	 res |= cdrom.Ident(ident, &log);
-
-	 if (automounted)
-	    UnmountCdrom(AptMountPoint);
-
-	 // dump any warnings/errors from add/unmount
-	 if (_error->empty() == false)
-	    _error->DumpErrors();
-      }
-
-   if (count == 0)
-      res = cdrom.Ident(ident, &log);
-
-   if (res == false)
-      _error->Error("%s", _(W_NO_CDROM_FOUND));
-
-   return res;
+   return AddOrIdent(true);
+}
+									/*}}}*/
+// DoIdent - Ident a CDROM						/*{{{*/
+static bool DoIdent(CommandLine &)
+{
+   return AddOrIdent(false);
 }
 									/*}}}*/
 // ShowHelp - Show the help screen					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &)
 {
    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
@@ -313,14 +268,12 @@ int main(int argc,const char *argv[])					/*{{{*/
       _config->Set("quiet","1");
    
    // Match the operation
-   CmdL.DispatchArg(Cmds);
+   bool returned = CmdL.DispatchArg(Cmds);
 
-   // Print any errors or warnings found during parsing
-   bool const Errors = _error->PendingError();
    if (_config->FindI("quiet",0) > 0)
       _error->DumpErrors();
    else
       _error->DumpErrors(GlobalError::DEBUG);
-   return Errors == true ? 100 : 0;
+   return returned == true ? 0 : 100;
 }
 									/*}}}*/
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 30c2a22d5..40ba468eb 100644
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -26,10 +26,10 @@
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/pkgsystem.h>
 
-#include <locale.h>
 #include <iostream>
 #include <string>
 #include <vector>
+#include <string.h>
 
 #include <apt-private/private-cmndline.h>
 
@@ -40,7 +40,7 @@ using namespace std;
 // DoShell - Handle the shell command					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool DoShell(CommandLine &CmdL)
+static bool DoShell(CommandLine &CmdL)
 {
    for (const char **I = CmdL.FileList + 1; *I != 0; I += 2)
    {
@@ -63,7 +63,7 @@ bool DoShell(CommandLine &CmdL)
 // DoDump - Dump the configuration space				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool DoDump(CommandLine &CmdL)
+static bool DoDump(CommandLine &CmdL)
 {
    bool const empty = _config->FindB("APT::Config::Dump::EmptyValue", true);
    std::string const format = _config->Find("APT::Config::Dump::Format", "%f \"%v\";\n");
@@ -78,7 +78,7 @@ bool DoDump(CommandLine &CmdL)
 // ShowHelp - Show the help screen					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ShowHelp(CommandLine &CmdL)
+static bool ShowHelp(CommandLine &)
 {
    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
@@ -108,7 +108,7 @@ int main(int argc,const char *argv[])					/*{{{*/
 				   {"help",&ShowHelp},
                                    {0,0}};
 
-   std::vector<CommandLine::Args> Args = getCommandArgs("apt-cdrom", CommandLine::GetCommand(Cmds, argc, argv));
+   std::vector<CommandLine::Args> Args = getCommandArgs("apt-config", CommandLine::GetCommand(Cmds, argc, argv));
 
    // Set up gettext support
    setlocale(LC_ALL,"");
@@ -155,6 +155,11 @@ int main(int argc,const char *argv[])					/*{{{*/
 	 _config->Set(comp + "UncompressArg::", *a);
    }
 
+   std::vector<std::string> const profiles = APT::Configuration::getBuildProfiles();
+   _config->Clear("APT::Build-Profiles");
+   for (std::vector<std::string>::const_iterator p = profiles.begin(); p != profiles.end(); ++p)
+      _config->Set("APT::Build-Profiles::", *p);
+
    // Match the operation
    CmdL.DispatchArg(Cmds);
    
diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc
index aa16b1271..04e13bde9 100644
--- a/cmdline/apt-dump-solver.cc
+++ b/cmdline/apt-dump-solver.cc
@@ -9,16 +9,18 @@
 // Include Files							/*{{{*/
 #include <apt-pkg/edsp.h>
 
-#include <config.h>
-
+#include <string.h>
+#include <unistd.h>
 #include <cstdio>
 #include <iostream>
+
+#include <config.h>
 									/*}}}*/
 
 // ShowHelp - Show a help screen					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ShowHelp() {
+static bool ShowHelp() {
 
 	std::cout <<
 		PACKAGE " " PACKAGE_VERSION " for " COMMON_ARCH " compiled on " __DATE__ " " __TIME__ << std::endl <<
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 2408a7d9d..e4428e051 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -18,8 +18,8 @@
 #include <apt-pkg/init.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/version.h>
@@ -30,14 +30,14 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/dirstream.h>
+#include <apt-pkg/mmap.h>
 
+#include <iostream>
 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
 #include <unistd.h>
-#include <locale.h>
-
-#include <fstream>
+#include <stdlib.h>
 
 #include "apt-extracttemplates.h"
 
@@ -137,7 +137,7 @@ bool DebFile::DoItem(Item &I, int &Fd)
 // DebFile::Process examine element in package and copy			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool DebFile::Process(Item &I, const unsigned char *data, 
+bool DebFile::Process(Item &/*I*/, const unsigned char *data,
 		unsigned long size, unsigned long pos)
 {
 	switch (Which)
@@ -212,7 +212,7 @@ bool DebFile::ParseInfo()
 // ShowHelp - show a short help text					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-int ShowHelp(void)
+static int ShowHelp(void)
 {
    	ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
@@ -237,26 +237,28 @@ int ShowHelp(void)
 // WriteFile - write the contents of the passed string to a file	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-string WriteFile(const char *package, const char *prefix, const char *data)
+static string WriteFile(const char *package, const char *prefix, const char *data)
 {
 	char fn[512];
-	static int i;
 
         std::string tempdir = GetTempDir();
-	snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d",
+	snprintf(fn, sizeof(fn), "%s/%s.%s.XXXXXX",
                  _config->Find("APT::ExtractTemplates::TempDir", 
                                tempdir.c_str()).c_str(),
-                 package, prefix, getpid(), i++);
+                 package, prefix);
 	FileFd f;
 	if (data == NULL)
 		data = "";
-
-	if (!f.Open(fn, FileFd::WriteTemp, 0600))
+        int fd = mkstemp(fn);
+        if (fd < 0) {
+		_error->Errno("ofstream::ofstream",_("Unable to mkstemp %s"),fn);
+                return string();
+        }
+	if (!f.OpenDescriptor(fd, FileFd::WriteOnly, FileFd::None, true))
 	{
 		_error->Errno("ofstream::ofstream",_("Unable to write to %s"),fn);
 		return string();
 	}
-
 	f.Write(data, strlen(data));
 	f.Close();
 	return fn;
@@ -265,7 +267,7 @@ string WriteFile(const char *package, const char *prefix, const char *data)
 // WriteConfig - write out the config data from a debian package file	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void WriteConfig(const DebFile &file)
+static void WriteConfig(const DebFile &file)
 {
 	string templatefile = WriteFile(file.Package.c_str(), "template", file.Template);
 	string configscript = WriteFile(file.Package.c_str(), "config", file.Config);
@@ -279,7 +281,7 @@ void WriteConfig(const DebFile &file)
 // InitCache - initialize the package cache				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool Go(CommandLine &CmdL)
+static bool Go(CommandLine &CmdL)
 {	
 	// Initialize the apt cache
 	MMap *Map = 0;
diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h
index 6d07a09c2..9cc3f5f25 100644
--- a/cmdline/apt-extracttemplates.h
+++ b/cmdline/apt-extracttemplates.h
@@ -11,11 +11,12 @@
 #define _APTEXTRACTTEMPLATE_H_
 
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/dirstream.h>
 
 #include <string>
 
+class pkgCache;
+
 class DebFile : public pkgDirStream
 {
 	FileFd File;
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6e9d3bf68..f682074a7 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -27,66 +27,67 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
+#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/algorithms.h>
 #include <apt-pkg/aptconfiguration.h>
-#include <apt-pkg/error.h>
+#include <apt-pkg/cachefile.h>
+#include <apt-pkg/cacheset.h>
+#include <apt-pkg/clean.h>
 #include <apt-pkg/cmndline.h>
-#include <apt-pkg/init.h>
+#include <apt-pkg/debmetaindex.h>
 #include <apt-pkg/depcache.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/acquire-item.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/clean.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/cachefile.h>
-#include <apt-pkg/cacheset.h>
-#include <apt-pkg/sptr.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/indexrecords.h>
+#include <apt-pkg/init.h>
 #include <apt-pkg/md5.h>
-#include <apt-pkg/versionmatch.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/metaindex.h>
 #include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/indexfile.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/srcrecords.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/version.h>
+#include <apt-pkg/acquire.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/upgrade.h>
-#include <apt-pkg/metaindex.h>
-#include <apt-pkg/indexrecords.h>
 
+#include <apt-private/acqprogress.h>
+#include <apt-private/private-cacheset.h>
+#include <apt-private/private-cachefile.h>
+#include <apt-private/private-cmndline.h>
 #include <apt-private/private-download.h>
 #include <apt-private/private-install.h>
-#include <apt-private/private-upgrade.h>
+#include <apt-private/private-main.h>
+#include <apt-private/private-moo.h>
 #include <apt-private/private-output.h>
-#include <apt-private/private-cacheset.h>
 #include <apt-private/private-update.h>
-#include <apt-private/private-cmndline.h>
-#include <apt-private/private-moo.h>
+#include <apt-private/private-upgrade.h>
 #include <apt-private/private-utils.h>
 
-#include <apt-pkg/debmetaindex.h>
-
-#include <apt-private/acqprogress.h>
-
-#include <set>
-#include <fstream>
-#include <sstream>
-
-#include <locale.h>
-#include <langinfo.h>
-#include <termios.h>
+#include <errno.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include <regex.h>
 #include <sys/wait.h>
-
-#include <apt-private/private-output.h>
-#include <apt-private/private-main.h>
+#include <unistd.h>
+#include <algorithm>
+#include <fstream>
+#include <iostream>
+#include <set>
+#include <string>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -97,7 +98,7 @@ using namespace std;
 // ---------------------------------------------------------------------
 /* This used to be inlined in DoInstall, but with the advent of regex package
    name matching it was split out.. */
-bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache,
+static bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache,
 		  pkgProblemResolver &Fix,bool Remove,bool BrokenFix,
 		  bool AllowFail = true)
 {
@@ -138,7 +139,7 @@ bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache,
 
 // helper that can go wit hthe next ABI break
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
-std::string MetaIndexFileNameOnDisk(metaIndex *metaindex)
+static std::string MetaIndexFileNameOnDisk(metaIndex *metaindex)
 {
    // FIXME: this cast is the horror, the horror
    debReleaseIndex *r = (debReleaseIndex*)metaindex;
@@ -159,7 +160,7 @@ std::string MetaIndexFileNameOnDisk(metaIndex *metaindex)
 // GetReleaseForSourceRecord - Return Suite for the given srcrecord	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-std::string GetReleaseForSourceRecord(pkgSourceList *SrcList,
+static std::string GetReleaseForSourceRecord(pkgSourceList *SrcList,
                                       pkgSrcRecords::Parser *Parse)
 {
    // try to find release
@@ -194,7 +195,7 @@ std::string GetReleaseForSourceRecord(pkgSourceList *SrcList,
 // FindSrc - Find a source record					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
+static pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
 			       pkgSrcRecords &SrcRecs,string &Src,
 			       CacheFile &CacheFile)
 {
@@ -430,7 +431,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
 }
 									/*}}}*/
 /* mark packages as automatically/manually installed.			{{{*/
-bool DoMarkAuto(CommandLine &CmdL)
+static bool DoMarkAuto(CommandLine &CmdL)
 {
    bool Action = true;
    int AutoMarkChanged = 0;
@@ -475,7 +476,7 @@ bool DoMarkAuto(CommandLine &CmdL)
 // DoDSelectUpgrade - Do an upgrade by following dselects selections	/*{{{*/
 // ---------------------------------------------------------------------
 /* Follows dselect's selections */
-bool DoDSelectUpgrade(CommandLine &CmdL)
+static bool DoDSelectUpgrade(CommandLine &)
 {
    CacheFile Cache;
    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
@@ -551,7 +552,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
 // DoClean - Remove download archives					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool DoClean(CommandLine &CmdL)
+static bool DoClean(CommandLine &)
 {
    std::string const archivedir = _config->FindDir("Dir::Cache::archives");
    std::string const pkgcache = _config->FindFile("Dir::cache::pkgcache");
@@ -599,7 +600,7 @@ class LogCleaner : public pkgArchiveCleaner
    };
 };
 
-bool DoAutoClean(CommandLine &CmdL)
+static bool DoAutoClean(CommandLine &)
 {
    // Lock the archive directory
    FileFd Lock;
@@ -623,7 +624,7 @@ bool DoAutoClean(CommandLine &CmdL)
 									/*}}}*/
 // DoDownload - download a binary					/*{{{*/
 // ---------------------------------------------------------------------
-bool DoDownload(CommandLine &CmdL)
+static bool DoDownload(CommandLine &CmdL)
 {
    CacheFile Cache;
    if (Cache.ReadOnlyOpen() == false)
@@ -696,7 +697,7 @@ bool DoDownload(CommandLine &CmdL)
 // ---------------------------------------------------------------------
 /* Opening automatically checks the system, this command is mostly used
    for debugging */
-bool DoCheck(CommandLine &CmdL)
+static bool DoCheck(CommandLine &)
 {
    CacheFile Cache;
    Cache.Open();
@@ -715,7 +716,7 @@ struct DscFile
    string Dsc;
 };
 
-bool DoSource(CommandLine &CmdL)
+static bool DoSource(CommandLine &CmdL)
 {
    CacheFile Cache;
    if (Cache.Open(false) == false)
@@ -740,7 +741,7 @@ bool DoSource(CommandLine &CmdL)
    pkgAcquire Fetcher;
    Fetcher.SetLog(&Stat);
 
-   DscFile *Dsc = new DscFile[CmdL.FileSize()];
+   SPtrArray<DscFile> Dsc = new DscFile[CmdL.FileSize()];
    
    // insert all downloaded uris into this set to avoid downloading them
    // twice
@@ -761,7 +762,6 @@ bool DoSource(CommandLine &CmdL)
       pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,Cache);
       
       if (Last == 0) {
-	 delete[] Dsc;
 	 return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
       }
       
@@ -795,7 +795,6 @@ bool DoSource(CommandLine &CmdL)
       // Back track
       vector<pkgSrcRecords::File> Lst;
       if (Last->Files(Lst) == false) {
-	 delete[] Dsc;
 	 return false;
       }
 
@@ -855,7 +854,6 @@ bool DoSource(CommandLine &CmdL)
    struct statvfs Buf;
    string OutputDir = ".";
    if (statvfs(OutputDir.c_str(),&Buf) != 0) {
-      delete[] Dsc;
       if (errno == EOVERFLOW)
 	 return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
 				OutputDir.c_str());
@@ -870,7 +868,6 @@ bool DoSource(CommandLine &CmdL)
            || unsigned(Stat.f_type) != RAMFS_MAGIC
 #endif
            )  {
-	 delete[] Dsc;
           return _error->Error(_("You don't have enough free space in %s"),
               OutputDir.c_str());
        }
@@ -892,7 +889,6 @@ bool DoSource(CommandLine &CmdL)
    {
       for (unsigned I = 0; I != J; I++)
 	 ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str());
-      delete[] Dsc;
       return true;
    }
    
@@ -903,7 +899,6 @@ bool DoSource(CommandLine &CmdL)
       for (; I != Fetcher.UriEnd(); ++I)
 	 cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
 	       I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;
-      delete[] Dsc;
       return true;
    }
 
@@ -911,14 +906,12 @@ bool DoSource(CommandLine &CmdL)
    bool Failed = false;
    if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true)
    {
-      delete[] Dsc;
       return _error->Error(_("Failed to fetch some archives."));
    }
 
    if (_config->FindB("APT::Get::Download-only",false) == true)
    {
       c1out << _("Download complete and in download only mode") << endl;
-      delete[] Dsc;
       return true;
    }
 
@@ -967,6 +960,12 @@ bool DoSource(CommandLine &CmdL)
 	    string buildopts = _config->Find("APT::Get::Host-Architecture");
 	    if (buildopts.empty() == false)
 	       buildopts = "-a" + buildopts + " ";
+
+	    // get all active build profiles
+	    std::string const profiles = APT::Configuration::getBuildProfilesString();
+	    if (profiles.empty() == false)
+	       buildopts.append(" -P").append(profiles).append(" ");
+
 	    buildopts.append(_config->Find("DPkg::Build-Options","-b -uc"));
 
 	    // Call dpkg-buildpackage
@@ -986,7 +985,6 @@ bool DoSource(CommandLine &CmdL)
       
       _exit(0);
    }
-   delete[] Dsc;
 
    // Wait for the subprocess
    int Status = 0;
@@ -1007,7 +1005,7 @@ bool DoSource(CommandLine &CmdL)
 // ---------------------------------------------------------------------
 /* This function will look at the build depends list of the given source 
    package and install the necessary packages to make it true, or fail. */
-bool DoBuildDep(CommandLine &CmdL)
+static bool DoBuildDep(CommandLine &CmdL)
 {
    CacheFile Cache;
 
@@ -1401,7 +1399,7 @@ bool DoBuildDep(CommandLine &CmdL)
  * pool/ next to the deb itself)
  * Example return: "pool/main/a/apt/apt_0.8.8ubuntu3" 
  */
-string GetChangelogPath(CacheFile &Cache, 
+static string GetChangelogPath(CacheFile &Cache, 
                         pkgCache::PkgIterator Pkg,
                         pkgCache::VerIterator Ver)
 {
@@ -1428,7 +1426,7 @@ string GetChangelogPath(CacheFile &Cache,
  * apt-get changelog mplayer-doc:
  *  http://packages.medibuntu.org/pool/non-free/m/mplayer/mplayer_1.0~rc4~try1.dsfg1-1ubuntu1+medibuntu1.changelog
  */
-bool GuessThirdPartyChangelogUri(CacheFile &Cache, 
+static bool GuessThirdPartyChangelogUri(CacheFile &Cache, 
                                  pkgCache::PkgIterator Pkg,
                                  pkgCache::VerIterator Ver,
                                  string &out_uri)
@@ -1453,7 +1451,7 @@ bool GuessThirdPartyChangelogUri(CacheFile &Cache,
 									/*}}}*/
 // DownloadChangelog - Download the changelog 			        /*{{{*/
 // ---------------------------------------------------------------------
-bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher, 
+static bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher, 
                        pkgCache::VerIterator Ver, string targetfile)
 /* Download a changelog file for the given package version to
  * targetfile. This will first try the server from Apt::Changelogs::Server
@@ -1508,7 +1506,7 @@ bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher,
 									/*}}}*/
 // DoChangelog - Get changelog from the command line			/*{{{*/
 // ---------------------------------------------------------------------
-bool DoChangelog(CommandLine &CmdL)
+static bool DoChangelog(CommandLine &CmdL)
 {
    CacheFile Cache;
    if (Cache.ReadOnlyOpen() == false)
@@ -1572,7 +1570,7 @@ bool DoChangelog(CommandLine &CmdL)
 // ShowHelp - Show a help screen					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ShowHelp(CommandLine &CmdL)
+static bool ShowHelp(CommandLine &)
 {
    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
@@ -1665,20 +1663,6 @@ bool ShowHelp(CommandLine &CmdL)
    return true;
 }
 									/*}}}*/
-// SigWinch - Window size change signal handler				/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void SigWinch(int)
-{
-   // Riped from GNU ls
-#ifdef TIOCGWINSZ
-   struct winsize ws;
-  
-   if (ioctl(1, TIOCGWINSZ, &ws) != -1 && ws.ws_col >= 5)
-      ScreenWidth = ws.ws_col - 1;
-#endif
-}
-									/*}}}*/
 int main(int argc,const char *argv[])					/*{{{*/
 {
    CommandLine::Dispatch Cmds[] = {{"update",&DoUpdate},
@@ -1733,14 +1717,12 @@ int main(int argc,const char *argv[])					/*{{{*/
    // see if we are in simulate mode
    CheckSimulateMode(CmdL);
 
+   // Init the signals
+   InitSignals();
+
    // Setup the output streams
    InitOutput();
 
-   // Setup the signals
-   signal(SIGPIPE,SIG_IGN);
-   signal(SIGWINCH,SigWinch);
-   SigWinch(0);
-
    // Match the operation
    CmdL.DispatchArg(Cmds);
 
diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
new file mode 100644
index 000000000..2c1107d90
--- /dev/null
+++ b/cmdline/apt-helper.cc
@@ -0,0 +1,125 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+/* #####################################################################
+   apt-helper - cmdline helpers
+   ##################################################################### */
+									/*}}}*/
+// Include Files							/*{{{*/
+#include <config.h>
+
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/acquire.h>
+#include <apt-pkg/acquire-item.h>
+
+#include <apt-private/acqprogress.h>
+#include <apt-private/private-output.h>
+#include <apt-private/private-download.h>
+#include <apt-private/private-cmndline.h>
+
+#include <iostream>
+#include <string>
+#include <vector>
+
+#include <apti18n.h>
+									/*}}}*/
+
+static bool DoDownloadFile(CommandLine &CmdL)
+{
+   if (CmdL.FileSize() <= 2)
+      return _error->Error(_("Must specify at least one pair url/filename"));
+
+
+   pkgAcquire Fetcher;
+   AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0));
+   Fetcher.Setup(&Stat);
+   std::string download_uri = CmdL.FileList[1];
+   std::string targetfile = CmdL.FileList[2];
+   std::string hash;
+   if (CmdL.FileSize() > 3)
+      hash = CmdL.FileList[3];
+   new pkgAcqFile(&Fetcher, download_uri, hash, 0, "desc", "short-desc", 
+                  "dest-dir-ignored", targetfile);
+   Fetcher.Run();
+   bool Failed = false;
+   if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true ||
+	 FileExists(targetfile) == false)
+      return _error->Error(_("Download Failed"));
+   return true;
+}
+
+static bool ShowHelp(CommandLine &)
+{
+   ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
+	    COMMON_ARCH,__DATE__,__TIME__);
+
+   if (_config->FindB("version") == true)
+     return true;
+
+   std::cout <<
+    _("Usage: apt-helper [options] command\n"
+      "       apt-helper [options] download-file uri target-path\n"
+      "\n"
+      "apt-helper is a internal helper for apt\n"
+      "\n"
+      "Commands:\n"
+      "   download-file - download the given uri to the target-path\n"
+      "\n"
+      "                       This APT helper has Super Meep Powers.\n");
+   return true;
+}
+
+
+int main(int argc,const char *argv[])					/*{{{*/
+{
+   CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
+				   {"download-file", &DoDownloadFile},
+                                   {0,0}};
+
+   std::vector<CommandLine::Args> Args = getCommandArgs(
+      "apt-download", CommandLine::GetCommand(Cmds, argc, argv));
+
+   // Set up gettext support
+   setlocale(LC_ALL,"");
+   textdomain(PACKAGE);
+
+   // Parse the command line and initialize the package library
+   CommandLine CmdL(Args.data(),_config);
+   if (pkgInitConfig(*_config) == false ||
+       CmdL.Parse(argc,argv) == false ||
+       pkgInitSystem(*_config,_system) == false)
+   {
+      if (_config->FindB("version") == true)
+	 ShowHelp(CmdL);
+      _error->DumpErrors();
+      return 100;
+   }
+
+   // See if the help should be shown
+   if (_config->FindB("help") == true ||
+       _config->FindB("version") == true ||
+       CmdL.FileSize() == 0)
+   {
+      ShowHelp(CmdL);
+      return 0;
+   }
+
+   InitOutput();
+
+   // Match the operation
+   CmdL.DispatchArg(Cmds);
+
+   // Print any errors or warnings found during parsing
+   bool const Errors = _error->PendingError();
+   if (_config->FindI("quiet",0) > 0)
+      _error->DumpErrors();
+   else
+      _error->DumpErrors(GlobalError::DEBUG);
+   return Errors == true ? 100 : 0;
+}
+									/*}}}*/
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index bf5b8c1fe..b85c07c33 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -20,7 +20,15 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/upgrade.h>
-
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <string.h>
+#include <iostream>
+#include <list>
+#include <string>
 #include <unistd.h>
 #include <cstdio>
 
@@ -30,7 +38,7 @@
 // ShowHelp - Show a help screen					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ShowHelp(CommandLine &CmdL) {
+static bool ShowHelp(CommandLine &) {
 	ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 		 COMMON_ARCH,__DATE__,__TIME__);
 
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index d3a3a780b..ed348358a 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -11,20 +11,31 @@
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/init.h>
-#include <apt-pkg/strutl.h>
 #include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
+
+#include <apt-private/private-cmndline.h>
 
-#include <algorithm>
 #include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
 #include <fcntl.h>
-
-#include <apt-private/private-cmndline.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <algorithm>
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -35,7 +46,7 @@ ostream c1out(0);
 ostream c2out(0);
 ofstream devnull("/dev/null");
 /* DoAuto - mark packages as automatically/manually installed		{{{*/
-bool DoAuto(CommandLine &CmdL)
+static bool DoAuto(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -82,7 +93,7 @@ bool DoAuto(CommandLine &CmdL)
 /* DoMarkAuto - mark packages as automatically/manually installed	{{{*/
 /* Does the same as DoAuto but tries to do it exactly the same why as
    the python implementation did it so it can be a drop-in replacement */
-bool DoMarkAuto(CommandLine &CmdL)
+static bool DoMarkAuto(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -119,7 +130,7 @@ bool DoMarkAuto(CommandLine &CmdL)
 }
 									/*}}}*/
 /* ShowAuto - show automatically installed packages (sorted)		{{{*/
-bool ShowAuto(CommandLine &CmdL)
+static bool ShowAuto(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -159,7 +170,7 @@ bool ShowAuto(CommandLine &CmdL)
 }
 									/*}}}*/
 /* DoHold - mark packages as hold by dpkg				{{{*/
-bool DoHold(CommandLine &CmdL)
+static bool DoHold(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -335,7 +346,7 @@ bool DoHold(CommandLine &CmdL)
 }
 									/*}}}*/
 /* ShowHold - show packages set on hold in dpkg status			{{{*/
-bool ShowHold(CommandLine &CmdL)
+static bool ShowHold(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
@@ -372,7 +383,7 @@ bool ShowHold(CommandLine &CmdL)
 // ShowHelp - Show a help screen					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ShowHelp(CommandLine &CmdL)
+static bool ShowHelp(CommandLine &)
 {
    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index 46989044e..c2b11890a 100644
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -25,9 +25,9 @@
 
 #include <vector>
 #include <algorithm>
-
-#include <locale.h>
-#include <unistd.h>
+#include <stdio.h>
+#include <iostream>
+#include <string>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -62,7 +62,7 @@ struct PkgName								/*{{{*/
 // DoIt - Sort a single file						/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool DoIt(string InFile)
+static bool DoIt(string InFile)
 {
    FileFd Fd(InFile,FileFd::ReadOnly);
    pkgTagFile Tags(&Fd);
@@ -142,7 +142,7 @@ bool DoIt(string InFile)
 // ShowHelp - Show the help text					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-int ShowHelp()
+static int ShowHelp()
 {
    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 7ef9060aa..72086af14 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -11,39 +11,12 @@
 // Include Files							/*{{{*/
 #include<config.h>
 
-#include <cassert>
-#include <locale.h>
-#include <iostream>
-#include <unistd.h>
-#include <errno.h>
-#include <regex.h>
-#include <stdio.h>
-#include <iomanip>
-#include <algorithm>
-
-
+#include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/cachefile.h>
-#include <apt-pkg/cacheset.h>
 #include <apt-pkg/init.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/cmndline.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/metaindex.h>
-#include <apt-pkg/hashes.h>
-
-#include <apti18n.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
 
 #include <apt-private/private-list.h>
 #include <apt-private/private-search.h>
@@ -55,13 +28,16 @@
 #include <apt-private/private-upgrade.h>
 #include <apt-private/private-show.h>
 #include <apt-private/private-main.h>
-#include <apt-private/private-utils.h>
 #include <apt-private/private-sources.h>
-									/*}}}*/
 
+#include <unistd.h>
+#include <iostream>
+#include <vector>
 
+#include <apti18n.h>
+									/*}}}*/
 
-bool ShowHelp(CommandLine &CmdL)
+static bool ShowHelp(CommandLine &)
 {
    ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
@@ -94,7 +70,7 @@ int main(int argc, const char *argv[])					/*{{{*/
 {
    CommandLine::Dispatch Cmds[] = {
                                    // query
-                                   {"list",&List},
+                                   {"list",&DoList},
                                    {"search", &FullTextSearch},
                                    {"show", &APT::Cmd::ShowPackage},
 
@@ -120,6 +96,10 @@ int main(int argc, const char *argv[])					/*{{{*/
 
    std::vector<CommandLine::Args> Args = getCommandArgs("apt", CommandLine::GetCommand(Cmds, argc, argv));
 
+   // Init the signals
+   InitSignals();
+
+   // Init the output
    InitOutput();
 
    // Set up gettext support
@@ -133,7 +113,7 @@ int main(int argc, const char *argv[])					/*{{{*/
     }
 
     // some different defaults
-   _config->CndSet("DPkgPM::Progress", "1");
+   _config->CndSet("DPkg::Progress-Fancy", "1");
    _config->CndSet("Apt::Color", "1");
    _config->CndSet("APT::Get::Upgrade-Allow-New", true);
 
diff --git a/cmdline/makefile b/cmdline/makefile
index f89192e10..c4a249cd6 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -47,6 +47,13 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-mark.cc
 include $(PROGRAM_H)
 
+# The apt-helper
+PROGRAM=apt-helper
+SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-helper.cc
+include $(PROGRAM_H)
+
 # The apt-report-mirror-failure program
 #SOURCE=apt-report-mirror-failure
 #TO=$(BIN)
diff --git a/configure.ac b/configure.ac
index a697597b5..a16055652 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
 
 PACKAGE="apt"
-PACKAGE_VERSION="0.9.15.4"
+PACKAGE_VERSION="1.0.3"
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
@@ -107,6 +107,13 @@ if test "x$HAVE_BZ2" = "xyes"; then
 	AC_DEFINE(HAVE_BZ2)
 fi
 
+HAVE_LZMA=no
+AC_CHECK_LIB(lzma, lzma_easy_encoder,[AC_CHECK_HEADER(lzma.h, [HAVE_LZMA=yes], [])], [])
+AC_SUBST(HAVE_LZMA)
+if test "x$HAVE_LZMA" = "xyes"; then
+	AC_DEFINE(HAVE_LZMA)
+fi
+
 dnl Converts the ARCH to be something singular for this general CPU family
 dnl This is often the dpkg architecture string.
 dnl First check against the full canonical canoncial-system-type in $target
diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs
index 4ec23f55d..df9701123 100644
--- a/debian/apt-doc.docs
+++ b/debian/apt-doc.docs
@@ -1,3 +1,2 @@
 README.progress-reporting
-README.MultiArch
 doc/external-dependency-solver-protocol.txt
diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh
index d105f440a..c00416127 100644
--- a/debian/apt.auto-removal.sh
+++ b/debian/apt.auto-removal.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 set -e
 
 # Author: Steve Langasek <steve.langasek@canonical.com>
@@ -42,7 +41,7 @@ version_test_gt ()
 	return "$?"
 }
 
-list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ && $2 !~ /-dbg$/ { print $2 }' | sed -e's/linux-image-//')
+list="$(${DPKG} -l | awk '/^ii[ ]+(linux|kfreebsd|gnumach)-image-[0-9]/ && $2 !~ /-dbg$/ { print $2 }' | sed -e 's#\(linux\|kfreebsd\|gnumach\)-image-##')"
 
 latest_version=""
 previous_version=""
@@ -64,30 +63,23 @@ then
 	previous_version=
 fi
 
-kernels=$(sort -u <<EOF
-$latest_version
+kernels="$(echo "$latest_version
 $installed_version
 $running_version
-$previous_version
-EOF
-)
+$previous_version" | sort -u | sed -e 's#\.#\\.#g' )"
 
-cat > "$config_file".dpkg-new <<EOF
-// File autogenerated by $0, do not edit
-APT
+generateconfig() {
+	cat <<EOF
+// DO NOT EDIT! File autogenerated by $0
+APT::NeverAutoRemove
 {
-  NeverAutoRemove
-  {
 EOF
-for kernel in $kernels; do
-	echo "    \"^linux-image-${kernel}$\";" >> "$config_file".dpkg-new
-	echo "    \"^linux-image-extra-${kernel}$\";" >> "$config_file".dpkg-new
-	echo "    \"^linux-signed-image-${kernel}$\";" >> "$config_file".dpkg-new
-	echo "    \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new
-	echo "    \"^linux-headers-${kernel}$\";" >> "$config_file".dpkg-new
-done
-cat >> "$config_file".dpkg-new <<EOF
-  };
-};
-EOF
-mv "$config_file".dpkg-new "$config_file"
+	apt-config dump --no-empty --format '%v%n' 'APT::VersionedKernelPackages' | while read package; do
+		for kernel in $kernels; do
+			echo "   \"^${package}-${kernel}$\";"
+		done
+	done
+	echo '};'
+}
+generateconfig > "${config_file}.dpkg-new"
+mv "${config_file}.dpkg-new" "$config_file"
diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove
index 9684c9c7d..fc02350ae 100644
--- a/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@@ -4,9 +4,26 @@ APT
   {
 	"^firmware-linux.*";
 	"^linux-firmware$";
-	"^kfreebsd-image.*";
-	"^gnumach$";
-	"^gnumach-image.*";
+  };
+
+  VersionedKernelPackages
+  {
+	# linux kernels
+	"linux-image";
+	"linux-headers";
+	"linux-image-extra";
+	"linux-signed-image";
+	# kfreebsd kernels
+	"kfreebsd-image";
+	"kfreebsd-headers";
+	# hurd kernels
+	"gnumach-image";
+	# (out-of-tree) modules
+	".*-modules";
+	".*-kernel";
+	"linux-backports-modules-.*";
+        # tools
+        "linux-tools";
   };
 
   Never-MarkAuto-Sections
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 71ac76555..ee0761bfb 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -41,7 +41,7 @@
 #  APT::Periodic::MaxSize "0"; (new)
 #  - Set maximum size of the cache in MB (0=disable). If the cache
 #    is bigger, cached package files are deleted until the size
-#    requirement is met (the biggest packages will be deleted 
+#    requirement is met (the oldest packages will be deleted 
 #    first).
 #
 #  APT::Periodic::Update-Package-Lists "0";
@@ -91,7 +91,7 @@ check_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
+        # certain dates (e.g. 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"
@@ -101,14 +101,14 @@ check_stamp()
     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
+        # on certain dates (e.g. America/Sao_Paulo), if date returns with error
         # return 0.
         return 0
     fi
 
     delta=$(($now-$stamp))
 
-    # intervall is in days, convert to sec.
+    # interval is in days, convert to sec.
     interval=$(($interval*60*60*24))
     debug_echo "check_stamp: interval=$interval, now=$now, stamp=$stamp, delta=$delta (sec)"
 
@@ -338,7 +338,7 @@ if test -r /var/lib/apt/extended_states; then
     fi
 fi
 
-# check apt-config exstance
+# check apt-config existence
 if ! which apt-config >/dev/null ; then
 	exit 0
 fi
diff --git a/debian/apt.install.in b/debian/apt.install.in
index 76d51e8dd..9c9489572 100644
--- a/debian/apt.install.in
+++ b/debian/apt.install.in
@@ -1,4 +1,5 @@
-bin/apt* usr/bin/
+bin/apt usr/bin/
+bin/apt-* usr/bin/
 bin/methods/* usr/lib/apt/methods/
 scripts/dselect/* usr/lib/dpkg/methods/apt/
 usr/share/locale/*/*/apt.mo
diff --git a/debian/apt.maintscript b/debian/apt.maintscript
new file mode 100644
index 000000000..939769355
--- /dev/null
+++ b/debian/apt.maintscript
@@ -0,0 +1,3 @@
+rm_conffile /etc/apt/apt.conf.d/20changelog 1.0.3 -- "@"
+
+
diff --git a/debian/changelog b/debian/changelog
index 59049b166..ce57ed639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.9.16~exp1) UNRELEASED; urgency=low
+apt (1.1~exp1) UNRELEASED; urgency=low
 
   [ Michael Vogt ]
   * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
@@ -9,7 +9,196 @@ apt (0.9.16~exp1) UNRELEASED; urgency=low
     - use sha{512,256,1} for deb-src when available LP: #1098738
   * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines
 
- -- Michael Vogt <mvo@debian.org>  Thu, 27 Feb 2014 22:44:26 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 07 May 2014 17:48:24 +0200
+
+apt (1.0.3) unstable; urgency=medium
+
+  [ Michael Vogt ]
+  * reduce delta to ubuntu
+  * provide support for vendor specific config files
+  * debian/apt-doc.docs: remove README.MultiArch
+  * Fix missing ScreenWidth check in apt.cc
+  * Only do openpty() if both stdin/stdout are terminals (Closes: 746434)
+
+  [ David Kalnischkies ]
+  * add a README for vendor information
+  * remove outdated README.MultiArch
+  * build http request in a stringstream
+  * enforce LFS for partial files in https range requests
+  * handle pkgnames shorter than modifiers (Closes: 744940)
+  * allow vendors to install configuration files
+
+  [ John Ogness ]
+  * properly undo CD-ROM mount in all error cases
+
+  [ Mahyuddin Ramli ]
+  * add vendor information for BlankOn (Closes: 743595)
+
+  [ Adam Conrad ]
+  * fix FileFd::Size bitswap on big-endian architectures (Closes: 745866)
+
+  [ Trần Ngọc Quân ]
+  * l10n: vi.po: Update one new string
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 05 May 2014 14:03:15 +0200
+
+apt (1.0.2) unstable; urgency=medium
+
+  [ Michael Vogt ]
+  * fix apt list output for pkgs in dpkg ^rc state
+  * Notice the user about "apt list -a" when only a single hit if found
+  * fix test-failure in adt
+  * apt-private/acqprogress.cc: fix output when ctrl-c is hit during 
+    apt update (LP: #1310548, closes: #744297)
+  * Fix option name DPkg::Progress-Fancy in apt.8 manpage
+    (LP: #1310506)
+
+  [ David Kalnischkies ]
+  * don't double-count seeks in FileFd::Skip for bzip/xz
+  * deal with umask only if we really need to for mkstemp
+  * consider priorities only for downloadable pkgs in resolver
+  * force fancy progressbar redraw on window size change
+  * clear HitEof flag in FileFd::Seek
+  * use Google C++ Testing Framework for libapt tests
+  * support dist-upgrade options in full-upgrade
+
+  [ Trần Ngọc Quân ]
+  * l10n: vi.po (624t): Update translation
+
+  [ Theppitak Karoonboonyanan ]
+  * Updated Thai program translation (closes: #745120)
+
+  [ James McCoy ]
+  * Consistently use Dpkg::Progress* in documentation (Closes: 745452)
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 25 Apr 2014 13:15:03 +0200
+
+apt (1.0.1) unstable; urgency=medium
+
+  [ Michael Vogt ]
+  * Fix crash in "apt list" when a sources.list file is unreable
+    (Closes: 743413)
+  * make apt search case-insensitive by default
+  * Fix possible race when stunnel/aptwebserver create their PID files
+    in the tests
+  * Fix insecure file permissions when using FileFd with OpenMode::Atomic
+    (LP: #1304657)
+
+  [ Julian Andres Klode ]
+  * Version the Breaks/Replaces for sun-java{5,6}-jdk (LP: #1302736)
+    (Closes: #743616)
+  * Add versioned openjdk-6-jdk breaks
+
+  [ Josef Vitu ]
+  * apt: Minor typo in 'apt' man page (closes: #743657)
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 10 Apr 2014 09:48:56 +0200
+
+apt (1.0) unstable; urgency=low
+
+  The "Happy birthday and 10000b years in the making" release
+
+  [ Julian Andres Klode ]
+  * apt-inst: Do not try to create a substring of an empty string in 
+    error reporting (LP: #1288718)
+
+  [ Beatrice Torracca ]
+  * Italian manpages translation update (Closes: 741867)
+
+  [ Kenshi Muto ]
+  * Japanese programs translation update (Closes: 742255)
+
+  [ David Kalnischkies ]
+  * continue reading in xz even if it outputs nothing
+  * only consider versioned kernel packages in autoremove (Closes: 741962)
+  * correct some reported typos in /etc/cron.daily/apt (Closes: 702016)
+  * ensure proper teardown in dpkg error cases (Closes: 738969)
+  * update symbols file to include new symbols from 0.9.16
+  * do IsInstallOk call in MarkInstall unconditionally
+  * discard candidates via IsInstallOk to allow override (Closes: 740750)
+
+  [ Michael Vogt ]
+  * install apt binary
+  * add apt.8.xml manpage
+  * make fancy-progress fg/bg color configurable via something like
+    Dpkg::Progress-Fancy::Progress-{bg,fg}="%1b[30m"
+    (thanks to Tim Wasser for the suggestion)
+  * Add progressbar to "Dpkg::Progress-Fancy"
+  * fix documentation for APT::Periodic::MaxSize "0" (closes: #740551)
+  * Use mkstemp() in apt-extracttemplaes (closes: #741627)
+  * Add new Debug::RunScripts debug option
+  * do not crash on SIGPIPE in pkgDPkgPM::RunScriptsWithPkgs()
+  * enable DPkg::Progress-Fancy by default when "apt" is used
+  * refresh po/pot and unfuzzy apt-extracttemplate manpage change
+  * remove no longer needed apt.7 page
+  * install "apt" binary by default
+  * add sun-java{5,6}-jdk to breaks/replaces as they provided a 
+    "apt" binary as well
+
+  [ Trần Ngọc Quân ]
+  * l10n: vi.po (623t): Update Vietnamese translation
+  * debian: Add default compress option to xz
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 01 Apr 2014 15:48:46 +0200
+
+apt (0.9.16.1) unstable; urgency=medium
+
+  [ Chris Leick ]
+  * Updated German doc translation
+
+  [ Julian Andres Klode ]
+  * Fix handling of autoclosing for compressed files (Closes: #741685)
+
+ -- Julian Andres Klode <jak@debian.org>  Sat, 15 Mar 2014 18:05:25 +0100
+
+apt (0.9.16) unstable; urgency=medium
+
+  [ Michael Vogt ]
+  * add hashsum support in apt-helper download-file and 
+    add more tests
+
+  [ Trần Ngọc Quân ]
+  * l10n: vi.po (624t): Update Vietnamese translation
+
+  [ David Kalnischkies ]
+  * propagate a negative score point along breaks/conflicts
+  * check version before adding scores in resolver
+  * autogenerate makefile for vendor system
+  * add default and override handling for Cnf::FindVector
+  * support DEB_BUILD_PROFILES and -P for build profiles
+  * do not configure already unpacked packages needlessly (Closes: 740843)
+  * if mountpoint has a ".disk" directory it is mounted
+  * no error for non-existing mountpoints in MountCdrom
+  * apt-cdrom ident shouldn't be interactive (Closes: 740673)
+  * support very long mtab entries in mountpoint discovery
+  * msgstr with elipses need three dots
+  * cmdline parsing: apt-config is not apt-cdrom
+  * use a configurable list of versioned kernel packages
+  * support kfreebsd and hurd in the kernel hook
+  * add ".*-{kernel,modules}-$KERVER" matcher for hook
+  * ensure that a dot is a dot in the hook
+  * use liblzma-dev to provide xz/lzma support
+  * use the pretty fullname of a pkg as download desciption
+
+  [ Johannes Schauer ]
+  * implement BuildProfileSpec support as dpkg has in 1.17.2 (Closes: 661537)
+
+  [ Wojciech Górski ]
+  * fix polish --install-suggests text in apt-get manpage (Closes: 741056)
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 14 Mar 2014 09:45:05 +0100
+
+apt (0.9.15.5) unstable; urgency=medium
+
+  [ Michael Vogt ]
+  * vendor/tanglu/makefile: add missing clean/sources.list
+  * run the acquire tests with the new apt-helper binary, this
+    fixes the autopkgtest failures
+
+  [ Martin Pitt ]
+  * Fix autopkgtest missing dependencies and locale (closes: #739988)
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 28 Feb 2014 08:44:25 +0100
 
 apt (0.9.15.4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0f16c16f1..4c795cf30 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,9 @@ Uploaders: Michael Vogt <mvo@debian.org>, Christian Perrier <bubulle@debian.org>
 Standards-Version: 3.9.5
 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
  gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),
- zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml,
- po4a (>= 0.34-2), autotools-dev, autoconf, automake
+ zlib1g-dev, libbz2-dev, liblzma-dev,
+ xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2),
+ autotools-dev, autoconf, automake, libgtest-dev
 Build-Depends-Indep: doxygen, debiandoc-sgml, graphviz
 Build-Conflicts: autoconf2.13, automake1.4
 Vcs-Git: git://anonscm.debian.org/apt/apt.git
@@ -18,10 +19,10 @@ XS-Testsuite: autopkgtest
 Package: apt
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gnupg
-Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~)
-Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~)
+Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~)
+Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~)
 Conflicts: python-apt (<< 0.7.93.2~)
-Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt
+Suggests: aptitude | synaptic | wajig, dpkg-dev (>= 1.17.2), apt-doc, python-apt
 Description: commandline package manager
  This package provides commandline tools for searching and
  managing as well as querying information about packages
@@ -107,7 +108,6 @@ Description: documentation for APT development
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: xz-utils
 Description: package management related utility programs
  This package contains some less used commandline utilities related
  to package management with APT.
diff --git a/debian/libapt-pkg4.13.symbols b/debian/libapt-pkg4.13.symbols
index 9b62606ce..9b280c040 100644
--- a/debian/libapt-pkg4.13.symbols
+++ b/debian/libapt-pkg4.13.symbols
@@ -184,9 +184,7 @@ libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER#
  (c++)"pkgRecords::Parser::~Parser()@Base" 0.8.0
  (c++)"pkgRecords::pkgRecords(pkgCache&)@Base" 0.8.0
  (c++)"pkgRecords::~pkgRecords()@Base" 0.8.0
- (c++)"pkgTagFile::Fill()@Base" 0.8.0
  (c++)"pkgTagFile::Step(pkgTagSection&)@Base" 0.8.0
- (c++)"pkgTagFile::Resize()@Base" 0.8.0
  (c++)"pkgTagFile::~pkgTagFile()@Base" 0.8.0
  (c++)"CdromDevice::~CdromDevice()@Base" 0.8.0
  (c++)"CommandLine::DispatchArg(CommandLine::Dispatch*, bool)@Base" 0.8.0
@@ -517,11 +515,8 @@ libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER#
  (c++)"pkgCacheGenerator::SelectFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, pkgIndexFile const&, unsigned long)@Base" 0.8.0
  (c++)"pkgCacheGenerator::FinishCache(OpProgress*)@Base" 0.8.0
  (c++)"pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0
- (c++)"pkgCacheGenerator::AllocateInMap(unsigned long const&)@Base" 0.8.0
  (c++)"pkgCacheGenerator::MakeStatusCache(pkgSourceList&, OpProgress*, MMap**, bool)@Base" 0.8.0
  (c++)"pkgCacheGenerator::WriteUniqString(char const*, unsigned int)@Base" 0.8.0
- (c++)"pkgCacheGenerator::WriteStringInMap(char const*)@Base" 0.8.0
- (c++)"pkgCacheGenerator::WriteStringInMap(char const*, unsigned long const&)@Base" 0.8.0
  (c++)"pkgCacheGenerator::CreateDynamicMMap(FileFd*, unsigned long)@Base" 0.8.0
  (c++)"pkgCacheGenerator::MergeFileProvides(pkgCacheGenerator::ListParser&)@Base" 0.8.0
  (c++)"pkgCacheGenerator::MakeOnlyStatusCache(OpProgress*, DynamicMMap**)@Base" 0.8.0
@@ -1126,24 +1121,24 @@ libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER#
  (arch=sh4|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __builtin_va_list&) const@Base" 0.8.15~exp1
  (arch=alpha|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __va_list_tag&) const@Base" 0.8.15~exp1
 ### architecture specific: va_list & size_t
- (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned int&)@Base" 0.8.11.4
- (arch=armel armhf|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, std::__va_list&, unsigned int&)@Base" 0.8.11.4
- (arch=alpha|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag&, unsigned long&)@Base" 0.8.11.4
- (arch=powerpc powerpcspe x32|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned int&)@Base" 0.8.11.4
- (arch=amd64 kfreebsd-amd64 s390 s390x|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned long&)@Base" 0.8.11.4
- (arch=hppa mips mipsel sparc|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned int&)@Base" 0.8.11.4
- (arch=ia64 sparc64|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned long&)@Base" 0.8.11.4
- (arch=sh4|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __builtin_va_list&, unsigned int&)@Base" 0.8.11.4
- (arch=ppc64|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned long&)@Base" 0.8.11.4
- (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned int&)@Base" 0.8.11.4
- (arch=armel armhf|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, std::__va_list&, int, unsigned int&)@Base" 0.8.11.4
- (arch=alpha|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag&, int, unsigned long&)@Base" 0.8.11.4
- (arch=powerpc powerpcspe x32|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned int&)@Base" 0.8.11.4
- (arch=amd64 kfreebsd-amd64 s390 s390x|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned long&)@Base" 0.8.11.4
- (arch=hppa mips mipsel sparc|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned int&)@Base" 0.8.11.4
- (arch=ia64 sparc64|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned long&)@Base" 0.8.11.4 1
- (arch=sh4|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __builtin_va_list&, int, unsigned int&)@Base" 0.8.11.4
- (arch=ppc64|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned long&)@Base" 0.8.11.4
+ (arch=i386 hurd-i386 kfreebsd-i386|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned int&)@Base" 0.8.11.4
+ (arch=armel armhf|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, std::__va_list&, unsigned int&)@Base" 0.8.11.4
+ (arch=alpha|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag&, unsigned long&)@Base" 0.8.11.4
+ (arch=powerpc powerpcspe x32|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned int&)@Base" 0.8.11.4
+ (arch=amd64 kfreebsd-amd64 s390 s390x|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned long&)@Base" 0.8.11.4
+ (arch=hppa mips mipsel sparc|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned int&)@Base" 0.8.11.4
+ (arch=ia64 sparc64|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned long&)@Base" 0.8.11.4
+ (arch=sh4|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, __builtin_va_list&, unsigned int&)@Base" 0.8.11.4
+ (arch=ppc64|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned long&)@Base" 0.8.11.4
+ (arch=i386 hurd-i386 kfreebsd-i386|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned int&)@Base" 0.8.11.4
+ (arch=armel armhf|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, std::__va_list&, int, unsigned int&)@Base" 0.8.11.4
+ (arch=alpha|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag&, int, unsigned long&)@Base" 0.8.11.4
+ (arch=powerpc powerpcspe x32|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned int&)@Base" 0.8.11.4
+ (arch=amd64 kfreebsd-amd64 s390 s390x|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned long&)@Base" 0.8.11.4
+ (arch=hppa mips mipsel sparc|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned int&)@Base" 0.8.11.4
+ (arch=ia64 sparc64|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned long&)@Base" 0.8.11.4 1
+ (arch=sh4|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __builtin_va_list&, int, unsigned int&)@Base" 0.8.11.4
+ (arch=ppc64|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned long&)@Base" 0.8.11.4
 ### architecture specific: size_t
  (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc x32|c++)"_strtabexpand(char*, unsigned int)@Base" 0.8.0
  (arch=alpha amd64 ia64 kfreebsd-amd64 s390 s390x sparc64 ppc64|c++)"_strtabexpand(char*, unsigned long)@Base" 0.8.0
@@ -1196,8 +1191,7 @@ libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER#
  (c++)"APT::Configuration::getCompressorExtensions()@Base" 0.8.12
  (c++)"APT::Configuration::setDefaultConfigurationForCompressors()@Base" 0.8.12
  (c++)"pkgAcqMetaClearSig::Custom600Headers()@Base" 0.8.13
- (c++|optional=private)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2
- (c++|optional=private)"PrintMode(char)@Base" 0.8.13.2
+ (c++)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2
  (c++)"pkgDepCache::IsModeChangeOk(pkgDepCache::ModeList, pkgCache::PkgIterator const&, unsigned long, bool)@Base" 0.8.13.2
  (c++)"pkgCache::DepIterator::IsNegative() const@Base" 0.8.15~exp1
  (c++)"Configuration::CndSet(char const*, int)@Base" 0.8.15.3
@@ -1238,18 +1232,14 @@ libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER#
  (c++)"EDSP::ReadRequest(int, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, bool&, bool&, bool&)@Base" 0.8.16~exp2
  (c++)"EDSP::ApplyRequest(std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, pkgDepCache&)@Base" 0.8.16~exp2
  (c++)"EDSP::ReadResponse(int, pkgDepCache&, OpProgress*)@Base" 0.8.16~exp2
- (c++)"EDSP::StringToBool(char const*, bool)@Base" 0.8.16~exp2
  (c++)"EDSP::WriteRequest(pkgDepCache&, _IO_FILE*, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2
  (c++)"EDSP::ExecuteSolver(char const*, int*, int*)@Base" 0.8.16~exp2
  (c++)"EDSP::WriteProgress(unsigned short, char const*, _IO_FILE*)@Base" 0.8.16~exp2
  (c++)"EDSP::WriteScenario(pkgDepCache&, _IO_FILE*, OpProgress*)@Base" 0.8.16~exp2
  (c++)"EDSP::WriteSolution(pkgDepCache&, _IO_FILE*)@Base" 0.8.16~exp2
  (c++)"EDSP::ResolveExternal(char const*, pkgDepCache&, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2
- (c++)"EDSP::WriteScenarioVersion(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.8.16~exp2
- (c++)"EDSP::WriteScenarioDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.8.16~exp2
  (c++)"EDSP::DepMap@Base" 0.8.16~exp2
  (c++)"EDSP::PrioMap@Base" 0.8.16~exp2
- (c++)"EDSP::ReadLine(int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.16~exp2
  (c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const&)@Base" 0.8.16~exp6
  (c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6
  (c++)"typeinfo for edspIFType@Base" 0.8.16~exp2
@@ -1386,7 +1376,6 @@ libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER#
  (c++)"SummationImplementation::AddFD(FileFd&, unsigned long long)@Base" 0.8.16~exp9
  (c++)"Hashes::AddFD(FileFd&, unsigned long long, bool, bool, bool, bool)@Base" 0.8.16~exp9
  (c++|optional=deprecated,previous-inline)"FileFd::gzFd()@Base" 0.8.0
- (c++|optional=private)"FileFd::OpenInternDescriptor(unsigned int, APT::Configuration::Compressor const&)@Base" 0.8.16~exp9
 ### CacheSet rework: making them real containers breaks bigtime the API (for the CacheSetHelper)
  (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator::getPkg() const@Base" 0.8.16~exp9
  (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::getConstructor() const@Base" 0.8.16~exp9
@@ -1426,7 +1415,6 @@ libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER#
  (c++)"APT::VersionContainerInterface::getInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
  (c++)"APT::VersionContainerInterface::FromModifierCommandLine(unsigned short&, APT::VersionContainerInterface*, pkgCacheFile&, char const*, std::list<APT::VersionContainerInterface::Modifier, std::allocator<APT::VersionContainerInterface::Modifier> > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
  (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&, OpProgress*)@Base" 0.8.16~exp9
- (c++)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&)@Base" 0.8.16~exp9
  (c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
  (c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
  (c++)"typeinfo for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
@@ -1538,11 +1526,6 @@ libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER#
  (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PkgIterator const&) const@Base" 0.8.16~exp10
  (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PrvIterator const&) const@Base" 0.8.16~exp10
  (c++)"FileFd::Write(int, void const*, unsigned long long)@Base" 0.8.16~exp14
- (c++|optional=private)"pkgCacheGenerator::MergeListGroup(pkgCacheGenerator::ListParser&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp7
- (c++|optional=private)"pkgCacheGenerator::MergeListPackage(pkgCacheGenerator::ListParser&, pkgCache::PkgIterator&)@Base" 0.8.16~exp7
- (c++|optional=private)"pkgCacheGenerator::MergeListVersion(pkgCacheGenerator::ListParser&, pkgCache::PkgIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, pkgCache::VerIterator*&)@Base" 0.8.16~exp7
- (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator&, pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.16~exp7
- (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator&, pkgCache::PkgIterator&)@Base" 0.8.16~exp7
  (c++)"pkgTagSection::Exists(char const*)@Base" 0.9.7.9~exp1
  (c++)"_strrstrip(char*)@Base" 0.9.7.9~exp2
  (c++)"SplitClearSignedFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, FileFd*, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*, FileFd*)@Base" 0.9.7.9~exp2
@@ -1551,7 +1534,6 @@ libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER#
  (c++)"SigVerify::RunGPGV(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int const&)@Base" 0.9.7.9~exp2
  (c++)"Configuration::Dump(std::basic_ostream<char, std::char_traits<char> >&, char const*, char const*, bool)@Base" 0.9.3
  (c++)"AcquireUpdate(pkgAcquire&, int, bool, bool)@Base" 0.9.3
- (c++|optional=private)"pkgAcqMethod::Dequeue()@Base" 0.9.4
  (c++)"pkgCache::DepIterator::IsMultiArchImplicit() const@Base" 0.9.6
  (c++)"pkgCache::PrvIterator::IsMultiArchImplicit() const@Base" 0.9.6
  (c++)"APT::PackageContainerInterface::FromGroup(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.9.7
@@ -1566,8 +1548,6 @@ libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER#
  (c++)"pkgCache::DepIterator::IsSatisfied(pkgCache::VerIterator const&) const@Base" 0.9.8
  (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, unsigned int, unsigned int const&, unsigned int const&, unsigned int*&)@Base" 0.9.8
  (c++)"pkgCacheGenerator::NewVersion(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int, unsigned long, unsigned long)@Base" 0.9.8
- (c++)"FileFd::FileFdErrno(char const*, char const*, ...)@Base" 0.9.9
- (c++)"FileFd::FileFdError(char const*, ...)@Base" 0.9.9
  (c++)"operator<<(std::basic_ostream<char, std::char_traits<char> >&, GlobalError::Item)@Base" 0.9.9
  (c++)"pkgDepCache::IsDeleteOkProtectInstallRequests(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1
  (c++)"pkgDepCache::IsInstallOkMultiArchSameVersionSynced(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1
@@ -1580,7 +1560,6 @@ libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER#
  (c++)"APT::CacheFilter::PackageNameMatchesFnmatch::operator()(pkgCache::GrpIterator const&)@Base" 0.9.11
  (c++)"APT::CacheFilter::PackageNameMatchesFnmatch::operator()(pkgCache::PkgIterator const&)@Base" 0.9.11
  (c++)"APT::PackageContainerInterface::FromFnmatch(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.9.11
- (c++|optional=private)"pkgTagFile::Resize(unsigned long long)@Base" 0.9.11
  (c++)"pkgTagSection::pkgTagSection()@Base" 0.9.11
  (c++)"strv_length(char const**)@Base" 0.9.11
  (c++)"StringSplit(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int)@Base" 0.9.11.3
@@ -1592,7 +1571,14 @@ libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER#
  (c++)"HashString::GetHashForFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.9.13.1
  (c++)"indexRecords::GetSuite() const@Base" 0.9.13.2
  (c++)"GetTempDir()@Base" 0.9.14.2
- (c++|optional=private)"pkgCdrom::MountAndIdentCDROM(Configuration&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, pkgCdromStatus*)@Base" 0.9.15.2
+ (c++)"APT::Configuration::getBuildProfiles()@Base" 0.9.16
+ (c++)"APT::Configuration::getBuildProfilesString()@Base" 0.9.16
+ (c++)"Configuration::FindVector(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.9.16
+ (c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&)@Base" 0.9.16
+ (c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&, bool const&)@Base" 0.9.16
+ (c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&, bool const&, bool const&, bool const&)@Base" 0.9.16
+ (c++)"pkgCacheGenerator::ListParser::SameVersion(unsigned short, pkgCache::VerIterator const&)@Base" 0.9.16
+ (c++)"Rename(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.16
 ### demangle strangeness - buildd report it as MISSING and as new…
  (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0
 ### gcc-4.6 artefacts
diff --git a/debian/rules b/debian/rules
index 1b3782ab6..f8b392986 100755
--- a/debian/rules
+++ b/debian/rules
@@ -189,6 +189,8 @@ apt: build-binary build-manpages debian/apt.install
 	cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
 	cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal
 	chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal
+	# install vendor specific apt confs
+	find -L vendor/current -name 'apt.conf-*' | while read conf; do cp "$${conf}" "debian/$@/etc/apt/apt.conf.d/$${conf#*-}"; done
 
 	# make rosetta happy and remove pot files in po/ (but leave stuff
 	# in po/domains/* untouched) and cp *.po into each domain dir
@@ -207,6 +209,9 @@ apt: build-binary build-manpages debian/apt.install
 	#mv debian/$@/usr/bin/apt-report-mirror-failure \
 	#   debian/$@/usr/lib/apt/apt-report-mirror-failure \
 
+	# move the apt-helper in place
+	mv debian/$@/usr/bin/apt-helper debian/$@/usr/lib/apt/apt-helper 
+
 	dh_bugfiles -p$@
 	dh_lintian -p$@
 	dh_installexamples -p$@ $(BLD)/docs/examples/*
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 000000000..d14f4af37
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+# Use xz compression by default, we save disk space
+compression = "xz"
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index 6dc4eaa93..e6bc5e0d1 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -2,9 +2,6 @@
 
 set -e
 
-unset LANGUAGE
-export LC_ALL=C
-
 # we need the buildin webserver for the tests
 if [ ! -e environment.mak ]; then
     make startup
@@ -14,5 +11,7 @@ make -C test/interactive-helper/
 # run against the installed apt
 APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/bin \
 APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \
+APT_INTEGRATION_TESTS_LIBEXEC_DIR=/usr/lib/apt/ \
 APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \
+APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \
 ./test/integration/run-tests
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 306bab1dc..ffd7c88b9 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -40,7 +40,7 @@ PROJECT_NUMBER         = @PACKAGE_VERSION@
 # for a project that appears at the top of each page and should give viewer
 # a quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          =
+PROJECT_BRIEF          = "commandline package manager"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is
 # included in the documentation. The maximum height of the logo should not
@@ -197,7 +197,7 @@ TAB_SIZE               = 8
 # will result in a user-defined paragraph with heading "Side Effects:".
 # You can put \n's in the value part of an alias to insert newlines.
 
-ALIASES                =
+ALIASES                = "TODO=\todo"
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding
@@ -601,7 +601,7 @@ CITE_BIB_FILES         =
 # The QUIET tag can be used to turn on/off the messages that are generated
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
-QUIET                  = NO
+QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated by doxygen. Possible values are YES and NO. If left blank
@@ -748,7 +748,7 @@ IMAGE_PATH             =
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
 
-INPUT_FILTER           =
+INPUT_FILTER           = "sed -e 's#//[ ]*FIXME:\?#/// \\todo#'"
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
 # basis.
@@ -1287,7 +1287,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml
index d27e05075..9f9888069 100644
--- a/doc/apt-extracttemplates.1.xml
+++ b/doc/apt-extracttemplates.1.xml
@@ -47,8 +47,8 @@
    <para>template-file and config-script are written to the temporary directory
    specified by the <option>-t</option> or <option>--tempdir</option>
    (<literal>APT::ExtractTemplates::TempDir</literal>) directory,
-   with filenames of the form <filename>package.template.XXXX</filename> and
-   <filename>package.config.XXXX</filename></para>
+   with filenames of the form <filename>package.template.XXXXXX</filename> and
+   <filename>package.config.XXXXXX</filename></para>
  </refsect1>
  
  <refsect1><title>options</title>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 595ea875d..a3bfc331c 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -371,7 +371,18 @@
      by <command>apt-get source --compile</command> and how cross-builddependencies
      are satisfied. By default is it not set which means that the host architecture
      is the same as the build architecture (which is defined by <literal>APT::Architecture</literal>).
-     Configuration Item: <literal>APT::Get::Host-Architecture</literal>
+     Configuration Item: <literal>APT::Get::Host-Architecture</literal>.
+     </para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-P</option></term>
+                   <term><option>--build-profiles</option></term>
+     <listitem><para>This option controls the activated build profiles for which
+     a source package is built by <command>apt-get source --compile</command> and
+     how build dependencies are satisfied. By default no build profile is active.
+     More than one build profile can be activated at a time by concatenating them
+     with a comma.
+     Configuration Item: <literal>APT::Build-Profiles</literal>.
      </para></listitem>
      </varlistentry>
 
@@ -525,7 +536,7 @@
      terminal window when packages are installed, upgraded or
      removed. For a machine parsable version of this data see
      README.progress-reporting in the apt doc directory.
-     Configuration Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</literal>.</para></listitem>
+     Configuration Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</literal>.</para></listitem>
      </varlistentry>
     
 
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index b9e6a881a..b25cd7375 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -39,6 +39,12 @@
   </citerefentry>"
 >
 
+<!ENTITY apt "<citerefentry>
+    <refentrytitle><command>apt</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
 <!ENTITY apt-preferences "<citerefentry>
     <refentrytitle><command>apt_preferences</command></refentrytitle>
     <manvolnum>5</manvolnum>
@@ -219,14 +225,13 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.15.4">
+<!ENTITY apt-product-version "1.0.3">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
 <!ENTITY stable-codename "wheezy">
 <!ENTITY testing-codename "jessie">
 <!ENTITY stable-version "7">
-<!ENTITY tanglu-codename "bartholomea">
 <!ENTITY ubuntu-codename "trusty">
 
 <!-- good and bad just refers to matching and not matching a pattern…
@@ -248,6 +253,26 @@
 <!ENTITY synopsis-param-filename "<filename><replaceable>&synopsis-filename;</replaceable></filename>">
 <!ENTITY synopsis-help "<arg choice='plain'><group choice='req'><arg choice='plain'>-v</arg><arg choice='plain'>--version</arg></group></arg>
 	<arg choice='plain'><group choice='req'><arg choice='plain'>-h</arg><arg choice='plain'>--help</arg></group></arg>">
+<!ENTITY synopsis-command-apt "<refsynopsisdiv><cmdsynopsis>
+	<command>apt</command>
+	<arg><option>-h</option></arg>
+	&synopsis-arg-option;
+	&synopsis-arg-config;
+	&synopsis-arg-target-release;
+	&synopsis-arg-architecture;
+	<group choice='req'>
+		<arg choice='plain'>list</arg>
+		<arg choice='plain'>search</arg>
+		<arg choice='plain'>show</arg>
+		<arg choice='plain'>update</arg>
+		<arg choice='plain'>install &synopsis-arg-pkgver;</arg>
+		<arg choice='plain'>remove &synopsis-arg-pkg;</arg>
+		<arg choice='plain'>upgrade</arg>
+		<arg choice='plain'>full-upgrade</arg>
+		<arg choice='plain'>edit-sources</arg>
+		&synopsis-help;
+	</group>
+</cmdsynopsis></refsynopsisdiv>">
 <!ENTITY synopsis-command-apt-get "<refsynopsisdiv><cmdsynopsis>
 	<command>apt-get</command>
 	<arg><option>-asqdyfmubV</option></arg>
diff --git a/doc/apt.8 b/doc/apt.8
deleted file mode 100644
index d84a3b4dd..000000000
--- a/doc/apt.8
+++ /dev/null
@@ -1,52 +0,0 @@
-.\" This manpage is copyright (C) 1998 Branden Robinson <branden@debian.org>.
-.\" 
-.\" This is free software; you may 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,
-.\" or (at your option) any later version.
-.\"
-.\" This 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 APT; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
-.\" 02111-1307 USA
-.TH apt 8 "16 June 1998" "Debian"
-.SH NAME
-apt \- Advanced Package Tool
-.SH SYNOPSIS
-.B apt
-.SH DESCRIPTION
-APT is a management system for software packages. For normal day to day
-package management there are several frontends available, such as
-.BR aptitude (8)
-for the command line or
-.BR synaptic (8)
-for the X Window System. Some options are only implemented in
-.BR apt-get (8)
-though.
-.SH SEE ALSO
-.BR apt-cache (8),
-.BR apt-get (8),
-.BR apt.conf (5),
-.BR sources.list (5),
-.BR apt_preferences (5),
-.BR apt-secure (8)
-.SH DIAGNOSTICS
-apt returns zero on normal operation, decimal 100 on error.
-.SH BUGS
-This manpage isn't even started.
-.PP
-See <http://bugs.debian.org/apt>.  If you wish to report a
-bug in
-.BR apt ,
-please see
-.I /usr/share/doc/debian/bug-reporting.txt
-or the
-.BR reportbug (1)
-command.
-.SH AUTHOR
-apt was written by the APT team <apt@packages.debian.org>.
diff --git a/doc/apt.8.xml b/doc/apt.8.xml
new file mode 100644
index 000000000..bcad5ee7f
--- /dev/null
+++ b/doc/apt.8.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent">
+%aptent;
+
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
+%aptverbatiment;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>2013-11-25T00:00:00Z</date>
+ </refentryinfo>
+ 
+ <refmeta>
+   <refentrytitle>apt</refentrytitle>
+   <manvolnum>8</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
+ </refmeta>
+ 
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt</refname>
+    <refpurpose>command-line interface</refpurpose>
+ </refnamediv>
+
+ &synopsis-command-apt;
+
+ <refsect1><title>Description</title>
+   <para><command>apt</command> (Advanced Package Tool) is the
+   command-line tool for handling packages. It provides a commandline
+   interface for the package management of the system.
+
+   See also &apt-get; and &apt-cache; for more low-level command options.
+   </para>
+
+   <variablelist>
+     <varlistentry><term><option>list</option></term>
+     <listitem><para><literal>list</literal> is used to
+     display a list of packages. It supports shell pattern for matching 
+     package names and the following options:
+       <option>--installed</option>, 
+       <option>--upgradable</option>, 
+       <option>--all-versions</option>
+     are supported.
+     </para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term><option>search</option></term>
+     <listitem><para><literal>search</literal> searches for the given
+     term(s) and display matching packages.
+     </para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>show</option></term>
+     <listitem><para><literal>show</literal> shows the package information
+     for the given package(s).
+     </para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>install</option></term>
+     <listitem>
+	 <para><literal>install</literal> is followed by one or more 
+	 package names desired for installation or upgrading. 
+	 </para>
+
+     <para>A specific version of a package can be selected for installation by 
+     following the package name with an equals and the version of the package 
+     to select. This will cause that version to be located and selected for
+     install. Alternatively a specific distribution can be selected by 
+     following the package name with a slash and the version of the 
+     distribution or the Archive name (stable, testing, unstable).</para>
+     </listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>remove</option></term>
+     <listitem><para><literal>remove</literal> is identical to <literal>install</literal> except that packages are 
+	 removed instead of installed. Note that removing a package leaves its
+	 configuration files on the system. If a plus sign is appended to the package 
+     name (with no intervening space), the identified package will be 
+     installed instead of removed.</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>edit-sources</option></term>
+     <listitem><para><literal>edit-sources</literal> lets you edit
+     your sources.list file and provides basic sanity checks.
+     </para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>update</option></term>
+     <listitem><para><literal>update</literal> is used to
+     resynchronize the package index files from their sources.
+     </para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term><option>upgrade</option></term>
+     <listitem><para><literal>upgrade</literal> is used to install the
+     newest versions of all packages currently installed on the system
+     from the sources enumerated in
+     <filename>/etc/apt/sources.list</filename>. New package will be
+     installed, but existing package will never removed.
+     </para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>full-upgrade</option></term>
+     <listitem><para><literal>full-upgrade</literal> performs the
+     function of upgrade but may also remove installed packages
+     if that is required in order to resolve a package conflict.
+     </para></listitem>
+     </varlistentry>
+
+
+   </variablelist>
+ </refsect1>
+ 
+ <refsect1><title>options</title>
+   &apt-cmdblurb;
+
+   <variablelist>
+
+     &apt-commonoptions;
+     
+   </variablelist>
+ </refsect1>
+
+ <refsect1><title>Script usage</title>
+  <para>
+   The &apt; commandline is designed as a end-user tool and it may
+   change the output between versions. While it tries to not break
+   backward compatibility there is no guarantee for it either.
+   All features of &apt; are available in  &apt-cache; and &apt-get;
+   via APT options. Please prefer using these commands in your scripts.
+  </para>
+ </refsect1>
+
+ <refsect1><title>Differences to &apt-get;</title>
+ <para>The <command>apt</command> command is meant to be pleasant for
+ end users and does not need to be backward compatible like
+ &apt-get;. Therefore some options are different:
+ 
+ <itemizedlist>
+   <listitem>
+     <para>The option <literal>DPkg::Progress-Fancy</literal> is enabled.
+     </para>
+   </listitem>
+   <listitem>
+     <para>The option <literal>APT::Color</literal> is enabled.
+     </para>
+   </listitem>
+   <listitem>
+     <para>A new <literal>list</literal> command is available
+     similar to <literal>dpkg --list</literal>.
+     </para>
+   </listitem>
+   <listitem>
+     <para>The option <literal>upgrade</literal> has
+     <literal>--with-new-pkgs</literal> enabled by default.
+     </para>
+   </listitem>
+
+ </itemizedlist>
+ </para>
+
+ </refsect1>
+
+ <refsect1><title>See Also</title>
+   <para>&apt-get;, &apt-cache;, &sources-list;,
+   &apt-conf;, &apt-config;, 
+   The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto.</para>
+ </refsect1>
+
+ <refsect1><title>Diagnostics</title>
+   <para><command>apt</command> returns zero on normal operation, decimal 100 on error.</para>
+ </refsect1>
+ &manbugs;
+</refentry>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index bfc43ba29..fcbf20dac 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -177,6 +177,15 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </para></listitem>
      </varlistentry>
 
+     <varlistentry><term><option>Build-Profiles</option></term>
+     <listitem><para>
+     List of all build profiles enabled for build-dependency resolution,
+     without the "<literal>profile.</literal>" namespace prefix.
+     By default this list is empty. The <envar>DEB_BUILD_PROFILES</envar>
+     as used by &dpkg-buildpackage; overrides the list notation.
+     </para></listitem>
+     </varlistentry>
+
      <varlistentry><term><option>Default-Release</option></term>
      <listitem><para>Default release to install packages from if more than one
      version is available. Contains release name, codename or release version. Examples: 'stable', 'testing',
@@ -1175,6 +1184,18 @@ DPkg::TriggersPending "true";</literallayout></para>
        </listitem>
      </varlistentry>
 
+     <varlistentry>
+       <term><option>Debug::RunScripts</option></term>
+       <listitem>
+        <para>
+          Display the external commands that are called by apt hooks.
+          This includes e.g. the config options
+          <literal>DPkg::{Pre,Post}-Invoke</literal> or
+          <literal>APT::Update::{Pre,Post}-Invoke</literal>.
+        </para>
+       </listitem>
+     </varlistentry>
+
 <!-- 2009/07/11 Currently used nowhere. The corresponding code
 is commented.
      <varlistentry>
diff --git a/doc/en/makefile b/doc/en/makefile
index 247ce38b5..1be137c73 100644
--- a/doc/en/makefile
+++ b/doc/en/makefile
@@ -19,23 +19,19 @@ apt-vendor.ent: ../../vendor/current/apt-vendor.ent
 	ln -sf $(shell readlink -f $^) $@
 
 # Install generation hooks
-manpages: $($(LOCAL)-LIST) apt.8
+manpages: $($(LOCAL)-LIST)
 
 $($(LOCAL)-LIST) :: % : ../%.xml $(STYLESHEET) $(INCLUDES)
 	echo Creating man page $@
 	$(XSLTPROC) -o $@ $(STYLESHEET) $<
 
-apt.8: ../apt.8
-	cp -a ../apt.8 apt.8
-
 # Clean rule
 .PHONY: clean/$(LOCAL)
 veryclean: clean/$(LOCAL)
 clean: clean/$(LOCAL)
 clean/$(LOCAL):
-	-rm -rf $($(@F)-LIST) apt.8 apt-vendor.ent
+	-rm -rf $($(@F)-LIST) apt-vendor.ent
 endif
 
 # Chain to the manpage rule
-SOURCE = apt.8
 include $(MANPAGE_H)
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 93e96cf16..2d9f829ba 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -149,7 +149,7 @@ APT
     MaxSize "0"; // (new)
     // - Set maximum size of the cache in MB (0=disable). If the cache
     //   is bigger, cached package files are deleted until the size
-    //   requirement is met (the biggest packages will be deleted 
+    //   requirement is met (the oldest packages will be deleted 
     //   first).
 
     Update-Package-Lists "0";
@@ -450,7 +450,7 @@ Debug
   aptcdrom "false";        // Show found package files
   IdentCdrom "false";
   acquire::netrc "false";  // netrc parser
-  
+  RunScripts "false";      // debug invocation of external scripts  
 }
 
 pkgCacheGen::Essential "native"; // other modes: all, none, installed
diff --git a/doc/makefile b/doc/makefile
index 4b63e542f..3939c749f 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -66,9 +66,7 @@ update-po:
 
 manpages/subdirs: $(MANPAGEPOLIST)
 $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
-	# first line is for apt.8 (see Bug#696923)
 	po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
-		$(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8,%.$(subst /,,$(dir $<)).8,$(wildcard *.8))) \
 		$(patsubst %,--translate-only $(dir $<)%,$(patsubst %.1.xml,%.$(subst /,,$(dir $<)).1.xml,$(wildcard *.1.xml))) \
 		$(patsubst %,--translate-only $(dir $<)%,$(patsubst %.2.xml,%.$(subst /,,$(dir $<)).2.xml,$(wildcard *.2.xml))) \
 		$(patsubst %,--translate-only $(dir $<)%,$(patsubst %.3.xml,%.$(subst /,,$(dir $<)).3.xml,$(wildcard *.3.xml))) \
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 348980dd7..9294cca97 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.9.15.3\n"
+"Project-Id-Version: apt-doc 1.0.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -497,26 +497,203 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27 apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27 apt-config.8.xml:28
+#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27 apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27 apt-config.8.xml:28
 msgid "8"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28 apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28 apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28 sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29 apt-ftparchive.1.xml:29
+#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28 apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28 apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28 sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29 apt-ftparchive.1.xml:29
 msgid "APT"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
-msgid "APT package handling utility -- command-line interface"
+#: apt.8.xml:32
+msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39 apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38 sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40 apt-ftparchive.1.xml:40
+#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39 apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38 sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40 apt-ftparchive.1.xml:40
 msgid "Description"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:38
+msgid ""
+"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
+"handling packages. It provides a commandline interface for the package "
+"management of the system.  See also &apt-get; and &apt-cache; for more "
+"low-level command options."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:47
+msgid ""
+"<literal>list</literal> is used to display a list of packages. It supports "
+"shell pattern for matching package names and the following options: "
+"<option>--installed</option>, <option>--upgradable</option>, "
+"<option>--all-versions</option> are supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:58
+msgid ""
+"<literal>search</literal> searches for the given term(s) and display "
+"matching packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:64
+msgid ""
+"<literal>show</literal> shows the package information for the given "
+"package(s)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:71
+msgid ""
+"<literal>install</literal> is followed by one or more package names desired "
+"for installation or upgrading."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:75 apt-get.8.xml:118
+msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for "
+"install. Alternatively a specific distribution can be selected by following "
+"the package name with a slash and the version of the distribution or the "
+"Archive name (stable, testing, unstable)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:85 apt-get.8.xml:153
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:93
+msgid ""
+"<literal>edit-sources</literal> lets you edit your sources.list file and "
+"provides basic sanity checks."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:99
+msgid ""
+"<literal>update</literal> is used to resynchronize the package index files "
+"from their sources."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:105
+msgid ""
+"<literal>upgrade</literal> is used to install the newest versions of all "
+"packages currently installed on the system from the sources enumerated in "
+"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
+"but existing package will never removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:114
+msgid ""
+"<literal>full-upgrade</literal> performs the function of upgrade but may "
+"also remove installed packages if that is required in order to resolve a "
+"package conflict."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 apt-ftparchive.1.xml:506
+msgid "options"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:134
+msgid "Script usage"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:136
+msgid ""
+"The &apt; commandline is designed as a end-user tool and it may change the "
+"output between versions. While it tries to not break backward compatibility "
+"there is no guarantee for it either.  All features of &apt; are available in "
+"&apt-cache; and &apt-get; via APT options. Please prefer using these "
+"commands in your scripts."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:144
+msgid "Differences to &apt-get;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:145
+msgid ""
+"The <command>apt</command> command is meant to be pleasant for end users and "
+"does not need to be backward compatible like &apt-get;. Therefore some "
+"options are different:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:151
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:155
+msgid "The option <literal>APT::Color</literal> is enabled."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:159
+msgid ""
+"A new <literal>list</literal> command is available similar to <literal>dpkg "
+"--list</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:164
+msgid ""
+"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
+"enabled by default."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707 sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609
+msgid "See Also"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:175
+msgid ""
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
+"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137 apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+msgid "Diagnostics"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:181
+msgid ""
+"<command>apt</command> returns zero on normal operation, decimal 100 on "
+"error."
+msgstr ""
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-get.8.xml:35
+msgid "APT package handling utility -- command-line interface"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:41
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
@@ -607,17 +784,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:118
-msgid ""
-"A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for "
-"install. Alternatively a specific distribution can be selected by following "
-"the package name with a slash and the version of the distribution or the "
-"Archive name (stable, testing, unstable)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:125
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
@@ -656,16 +822,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:153
-msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:161
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
@@ -791,11 +947,6 @@ msgid ""
 "<option>install</option> command."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 apt-ftparchive.1.xml:506
-msgid "options"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:262
 msgid ""
@@ -935,18 +1086,28 @@ msgid ""
 "are satisfied. By default is it not set which means that the host "
 "architecture is the same as the build architecture (which is defined by "
 "<literal>APT::Architecture</literal>).  Configuration Item: "
-"<literal>APT::Get::Host-Architecture</literal>"
+"<literal>APT::Get::Host-Architecture</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:380
 msgid ""
+"This option controls the activated build profiles for which a source package "
+"is built by <command>apt-get source --compile</command> and how build "
+"dependencies are satisfied. By default no build profile is active.  More "
+"than one build profile can be activated at a time by concatenating them with "
+"a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:391
+msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:396
 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -955,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:403
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -967,7 +1128,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:404
+#: apt-get.8.xml:415
 msgid ""
 "Do not upgrade packages; when used in conjunction with "
 "<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -976,7 +1137,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:411
+#: apt-get.8.xml:422
 msgid ""
 "Do not install new packages; when used in conjunction with "
 "<literal>install</literal>, <literal>only-upgrade</literal> will install "
@@ -986,7 +1147,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:430
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -996,7 +1157,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:438
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "
@@ -1009,7 +1170,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:449
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be "
@@ -1019,14 +1180,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:446
+#: apt-get.8.xml:457
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:462
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1037,7 +1198,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:461
+#: apt-get.8.xml:472
 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -1052,7 +1213,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:476
+#: apt-get.8.xml:487
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where "
@@ -1062,14 +1223,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:494
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:500
 msgid ""
 "If the command is either <literal>install</literal> or "
 "<literal>remove</literal>, then this option acts like running the "
@@ -1078,7 +1239,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:507
 msgid ""
 "Only has meaning for the <literal>source</literal> and "
 "<literal>build-dep</literal> commands.  Indicates that the given source "
@@ -1090,7 +1251,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:518
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -1099,14 +1260,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:524
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:529
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: "
@@ -1114,40 +1275,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:535
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and "
+"Item: <literal>Dpkg::Progress</literal> and "
 "<literal>Dpkg::Progress-Fancy</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 apt.conf.5.xml:1200 apt_preferences.5.xml:700
+#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 apt.conf.5.xml:1221 apt_preferences.5.xml:700
 msgid "Files"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609
-msgid "See Also"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:559
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
 "APT Howto."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
-msgid "Diagnostics"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:565
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -2465,7 +2616,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:182
+msgid ""
+"List of all build profiles enabled for build-dependency resolution, without "
+"the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
+"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by "
+"&dpkg-buildpackage; overrides the list notation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:190
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -2474,14 +2634,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:187
+#: apt.conf.5.xml:196
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:201
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -2490,7 +2650,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:209
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -2505,7 +2665,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:221
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -2522,7 +2682,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:234
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -2533,7 +2693,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:245
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -2546,7 +2706,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:248
+#: apt.conf.5.xml:257
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -2567,38 +2727,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:273
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:268
+#: apt.conf.5.xml:277
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:282
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:278
+#: apt.conf.5.xml:287
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:293
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:294
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -2606,7 +2766,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#: apt.conf.5.xml:301
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -2619,7 +2779,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:314
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2631,7 +2791,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:317
+#: apt.conf.5.xml:326
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2643,7 +2803,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:338
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2651,7 +2811,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:341
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -2663,7 +2823,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:342
+#: apt.conf.5.xml:351
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of "
 "<literal>host</literal> or <literal>access</literal> which determines how "
@@ -2673,21 +2833,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:350
+#: apt.conf.5.xml:359
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:364
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:369
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
 "URIs. It is in the standard form of "
@@ -2700,7 +2860,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:377
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -2712,14 +2872,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:378 apt.conf.5.xml:466
+#: apt.conf.5.xml:387 apt.conf.5.xml:475
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:390
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
@@ -2731,14 +2891,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:388
+#: apt.conf.5.xml:397
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:400
 msgid ""
 "The used bandwidth can be limited with "
 "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -2748,7 +2908,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:398
+#: apt.conf.5.xml:407
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -2756,7 +2916,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -2770,7 +2930,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:429
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2781,7 +2941,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:437
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2805,7 +2965,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:458
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of "
@@ -2826,7 +2986,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:478
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -2836,7 +2996,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:485
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the "
 "<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the "
@@ -2846,7 +3006,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:490
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -2856,13 +3016,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:499
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -2875,7 +3035,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:512
 msgid ""
 "For GPGV URIs the only configurable option is "
 "<literal>gpgv::Options</literal>, which passes additional parameters to "
@@ -2883,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:523
 #, no-wrap
 msgid ""
 "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -2891,7 +3051,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:518
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -2903,19 +3063,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:528
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:531
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:524
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -2933,13 +3093,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:538
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:533
 msgid ""
 "Note that the "
 "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -2955,7 +3115,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:543
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -2963,7 +3123,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:541
+#: apt.conf.5.xml:550
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -2972,7 +3132,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:558
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the "
@@ -2984,13 +3144,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:575
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:563
 msgid ""
 "The default list includes \"environment\" and "
 "\"en\". \"<literal>environment</literal>\" has a special meaning here: it "
@@ -3012,7 +3172,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:576
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -3022,22 +3182,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:582
+#: apt.conf.5.xml:591
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:598
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:600
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -3049,7 +3209,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:607
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -3062,7 +3222,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:616
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3072,7 +3232,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:622
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -3080,7 +3240,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:626
 msgid ""
 "Binary programs are pointed to by "
 "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -3092,7 +3252,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:634
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3105,7 +3265,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:647
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -3116,12 +3276,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:656
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:658
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3129,7 +3289,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:663
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, "
@@ -3143,40 +3303,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:682
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:678
+#: apt.conf.5.xml:687
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:693
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:694
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:699
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -3184,7 +3344,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:696
+#: apt.conf.5.xml:705
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3193,7 +3353,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:712
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3204,7 +3364,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:719
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3213,7 +3373,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:724
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -3224,7 +3384,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:731
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</literal> "
@@ -3235,26 +3395,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:741
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:746
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:751
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:752
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3269,7 +3429,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:767
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3279,7 +3439,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:761
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -3293,7 +3453,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:774
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -3306,7 +3466,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:782
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is "
@@ -3324,7 +3484,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:797
 msgid ""
 "If this option is set APT will call <command>dpkg --configure "
 "--pending</command> to let &dpkg; handle all required configurations and "
@@ -3336,7 +3496,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:804
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -3347,7 +3507,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:817
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3359,7 +3519,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:810
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3373,12 +3533,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:830
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:831
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -3387,12 +3547,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:839
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:841
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3403,7 +3563,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:852
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -3411,7 +3571,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:860
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s "
@@ -3419,7 +3579,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:869
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3429,65 +3589,65 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:877
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:887
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:896
 msgid "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:907
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:918
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:929
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:940
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:951
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:961
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:971
 msgid ""
 "Output each cryptographic hash that is generated by the "
 "<literal>apt</literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:981
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -3495,52 +3655,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:992
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1004
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1014
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1024
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1036
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1047
 msgid "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1049
+#: apt.conf.5.xml:1058
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1059
+#: apt.conf.5.xml:1068
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial "
@@ -3550,7 +3710,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1082
 msgid ""
 "Generate debug messages describing which packages are marked as "
 "keep/install/remove while the ProblemResolver does his work.  Each addition "
@@ -3568,45 +3728,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1094
+#: apt.conf.5.xml:1103
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1114
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1125
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1137
 msgid "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1139
+#: apt.conf.5.xml:1148
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1149
+#: apt.conf.5.xml:1158
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1160
+#: apt.conf.5.xml:1169
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -3614,19 +3774,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1172
+#: apt.conf.5.xml:1181
 msgid ""
 "Print information about the vendors read from "
 "<filename>/etc/apt/vendors.list</filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:1191
+msgid ""
+"Display the external commands that are called by apt hooks.  This includes "
+"e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239 apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1195
+#: apt.conf.5.xml:1216
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3634,7 +3802,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1207
+#: apt.conf.5.xml:1228
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
@@ -5074,8 +5242,8 @@ msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
-"filenames of the form <filename>package.template.XXXX</filename> and "
-"<filename>package.config.XXXX</filename>"
+"filenames of the form <filename>package.template.XXXXXX</filename> and "
+"<filename>package.config.XXXXXX</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5837,115 +6005,6 @@ msgid ""
 "100 on error."
 msgstr ""
 
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "apt"
-msgstr ""
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "16 June 1998"
-msgstr ""
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "Debian"
-msgstr ""
-
-#. type: SH
-#: apt.8:18
-#, no-wrap
-msgid "NAME"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:20
-msgid "apt - Advanced Package Tool"
-msgstr ""
-
-#. type: SH
-#: apt.8:20
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:22
-msgid "B<apt>"
-msgstr ""
-
-#. type: SH
-#: apt.8:22
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:31
-msgid ""
-"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-"System. Some options are only implemented in B<apt-get>(8)  though."
-msgstr ""
-
-#. type: SH
-#: apt.8:31
-#, no-wrap
-msgid "SEE ALSO"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:38
-msgid ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-msgstr ""
-
-#. type: SH
-#: apt.8:38
-#, no-wrap
-msgid "DIAGNOSTICS"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:40
-msgid "apt returns zero on normal operation, decimal 100 on error."
-msgstr ""
-
-#. type: SH
-#: apt.8:40
-#, no-wrap
-msgid "BUGS"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:42
-msgid "This manpage isn't even started."
-msgstr ""
-
-#. type: Plain text
-#: apt.8:51
-msgid ""
-"See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-"B<reportbug>(1)  command."
-msgstr ""
-
-#. type: SH
-#: apt.8:51
-#, no-wrap
-msgid "AUTHOR"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:52
-msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-msgstr ""
-
 #. type: <title></title>
 #: guide.sgml:4
 msgid "APT User's Guide"
diff --git a/doc/po/de.po b/doc/po/de.po
index b7d84acc1..e5b61da60 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.9.14.2\n"
+"Project-Id-Version: apt-doc 0.9.16\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
-"PO-Revision-Date: 2014-01-26 15:26+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -615,40 +615,266 @@ msgid ""
 msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27 apt-mark.8.xml:28
-#: apt-secure.8.xml:27 apt-cdrom.8.xml:27 apt-config.8.xml:28
+#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
+#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
+#: apt-config.8.xml:28
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28 apt-mark.8.xml:29
-#: apt-secure.8.xml:28 apt-cdrom.8.xml:28 apt-config.8.xml:29
-#: apt.conf.5.xml:34 apt_preferences.5.xml:28 sources.list.5.xml:29
-#: apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29 apt-ftparchive.1.xml:29
+#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
+#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
+#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
+#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
+#: apt-ftparchive.1.xml:29
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
-msgid "APT package handling utility -- command-line interface"
-msgstr "APT-Werkzeug für den Umgang mit Paketen -- Befehlszeilenschnittstelle"
+#: apt.8.xml:32
+msgid "command-line interface"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 apt-mark.8.xml:40
-#: apt-secure.8.xml:52 apt-cdrom.8.xml:39 apt-config.8.xml:40
-#: apt.conf.5.xml:43 apt_preferences.5.xml:38 sources.list.5.xml:38
-#: apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40 apt-ftparchive.1.xml:40
+#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
+#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
+#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
+#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
+#: apt-ftparchive.1.xml:40
 msgid "Description"
 msgstr "Beschreibung"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
+#: apt.8.xml:38
+msgid ""
+"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
+"handling packages. It provides a commandline interface for the package "
+"management of the system.  See also &apt-get; and &apt-cache; for more low-"
+"level command options."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:47
+msgid ""
+"<literal>list</literal> is used to display a list of packages. It supports "
+"shell pattern for matching package names and the following options: "
+"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"versions</option> are supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:58
+msgid ""
+"<literal>search</literal> searches for the given term(s) and display "
+"matching packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:64
+#, fuzzy
+#| msgid ""
+#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
+#| "package has."
+msgid ""
+"<literal>show</literal> shows the package information for the given "
+"package(s)."
+msgstr ""
+"<literal>rdepends</literal> zeigt eine Liste von jeder "
+"Rückwärtsabhängigkeit, die ein Paket hat."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:71
+msgid ""
+"<literal>install</literal> is followed by one or more package names desired "
+"for installation or upgrading."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:75 apt-get.8.xml:118
+msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"Eine bestimmte Version eines Paketes kann durch den Paketnamen gefolgt von "
+"einem Gleichheitszeichen und der Version des Paketes zur Installation "
+"ausgewählt werden. Dies bewirkt, dass diese Version gesucht und zum "
+"Installieren ausgewählt wird. Alternativ kann eine bestimmte Distribution "
+"durch den Paketnamen gefolgt von einem Schrägstrich und der Version der "
+"Distribution oder des Archivnamens (»stable«, »testing«, »unstable«) "
+"ausgewählt werden."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:85 apt-get.8.xml:153
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> ist identisch mit <literal>install</literal>, mit "
+"der Ausnahme, dass Pakte entfernt anstatt installiert werden. Beachten Sie, "
+"dass das Entfernen von Paketen deren Konfigurationsdateien im System "
+"belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
+"Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:93
+msgid ""
+"<literal>edit-sources</literal> lets you edit your sources.list file and "
+"provides basic sanity checks."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:99
 #, fuzzy
 #| msgid ""
-#| "<command>apt-get</command> is the command-line tool for handling "
-#| "packages, and may be considered the user's \"back-end\" to other tools "
-#| "using the APT library.  Several \"front-end\" interfaces exist, such as "
-#| "&dselect;, &aptitude;, &synaptic; and &wajig;."
+#| "<literal>showhold</literal> is used to print a list of packages on hold "
+#| "in the same way as for the other show commands."
+msgid ""
+"<literal>update</literal> is used to resynchronize the package index files "
+"from their sources."
+msgstr ""
+"<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
+"Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:105
+msgid ""
+"<literal>upgrade</literal> is used to install the newest versions of all "
+"packages currently installed on the system from the sources enumerated in "
+"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
+"but existing package will never removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:114
+msgid ""
+"<literal>full-upgrade</literal> performs the function of upgrade but may "
+"also remove installed packages if that is required in order to resolve a "
+"package conflict."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
+#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
+#: apt-ftparchive.1.xml:506
+msgid "options"
+msgstr "Optionen"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:134
+msgid "Script usage"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:136
+msgid ""
+"The &apt; commandline is designed as a end-user tool and it may change the "
+"output between versions. While it tries to not break backward compatibility "
+"there is no guarantee for it either.  All features of &apt; are available in "
+"&apt-cache; and &apt-get; via APT options. Please prefer using these "
+"commands in your scripts."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:144
+msgid "Differences to &apt-get;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:145
+msgid ""
+"The <command>apt</command> command is meant to be pleasant for end users and "
+"does not need to be backward compatible like &apt-get;. Therefore some "
+"options are different:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:151
+#, fuzzy
+#| msgid "the <literal>Package:</literal> line"
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgstr "die <literal>Package:</literal>-Zeile"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:155
+#, fuzzy
+#| msgid "the <literal>Component:</literal> line"
+msgid "The option <literal>APT::Color</literal> is enabled."
+msgstr "die <literal>Component:</literal>-Zeile"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:159
+msgid ""
+"A new <literal>list</literal> command is available similar to <literal>dpkg "
+"--list</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:164
+#, fuzzy
+#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+msgid ""
+"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
+"enabled by default."
+msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
+#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
+#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
+#: apt-ftparchive.1.xml:609
+msgid "See Also"
+msgstr "Siehe auch"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:175
+#, fuzzy
+#| msgid ""
+#| "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-"
+#| "config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
+#| "preferences;, the APT Howto."
+msgid ""
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
+"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
+msgstr ""
+"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
+"&apt-secure;, die APT-Benutzeranleitung in &guidesdir;, &apt-preferences;, "
+"das APT-Howto."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
+#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
+#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+msgid "Diagnostics"
+msgstr "Diagnose"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:181
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
+#| "on error."
+msgid ""
+"<command>apt</command> returns zero on normal operation, decimal 100 on "
+"error."
+msgstr ""
+"<command>apt-get</command> gibt bei normalen Operationen 0 zurück, dezimal "
+"100 bei Fehlern."
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-get.8.xml:35
+msgid "APT package handling utility -- command-line interface"
+msgstr "APT-Werkzeug für den Umgang mit Paketen -- Befehlszeilenschnittstelle"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-get.8.xml:41
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -658,7 +884,7 @@ msgstr ""
 "<command>apt-get</command> ist ein Befehlszeilenwerkzeug zur Handhabung von "
 "Paketen und könnte als »Backend« anderer Werkzeugen betrachtet werden, die "
 "die APT-Bibliothek benutzen. Es existieren mehrere "
-"Oberflächenschnittstellen, wie &dselect;, &aptitude;, &synaptic; und &wajig;."
+"Oberflächenschnittstellen, wie &aptitude;, &synaptic; und &wajig;."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
@@ -794,24 +1020,6 @@ msgstr ""
 "get getroffen wurden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:118
-msgid ""
-"A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
-msgstr ""
-"Eine bestimmte Version eines Paketes kann durch den Paketnamen gefolgt von "
-"einem Gleichheitszeichen und der Version des Paketes zur Installation "
-"ausgewählt werden. Dies bewirkt, dass diese Version gesucht und zum "
-"Installieren ausgewählt wird. Alternativ kann eine bestimmte Distribution "
-"durch den Paketnamen gefolgt von einem Schrägstrich und der Version der "
-"Distribution oder des Archivnamens (»stable«, »testing«, »unstable«) "
-"ausgewählt werden."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:125
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
@@ -871,21 +1079,6 @@ msgstr ""
 "Zeichen, um genauere reguläre Ausdruck zu erstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:153
-msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"<literal>remove</literal> ist identisch mit <literal>install</literal>, mit "
-"der Ausnahme, dass Pakte entfernt anstatt installiert werden. Beachten Sie, "
-"dass das Entfernen von Paketen deren Konfigurationsdateien im System "
-"belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
-"Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:161
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
@@ -984,7 +1177,7 @@ msgid ""
 "option> option instead."
 msgstr ""
 "<literal>build-dep</literal> veranlasst apt-get, Pakete zu installieren/"
-"entfernen, um zu versuchen, die Bau-Abhängigkeiten eines Quellpakets zu "
+"entfernen, um zu versuchen, die Bauabhängigkeiten eines Quellpakets zu "
 "erfüllen. Standardmäßig werden die Abhängigkeiten erfüllt, um das Paket auf "
 "native Art zu bauen. Falls gewünscht, kann stattdessen eine "
 "Rechnerarchitektur mit der Option <option>--host-architecture</option> "
@@ -1010,15 +1203,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:217
-#, fuzzy
-#| msgid ""
-#| "<literal>clean</literal> clears out the local repository of retrieved "
-#| "package files. It removes everything but the lock file from "
-#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/"
-#| "archives/partial/</filename>. When APT is used as a &dselect; method, "
-#| "<literal>clean</literal> is run automatically.  Those who do not use "
-#| "dselect will likely want to run <literal>apt-get clean</literal> from "
-#| "time to time to free up disk space."
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -1028,10 +1212,7 @@ msgstr ""
 "<literal>clean</literal> bereinigt das lokale Depot von heruntergeladenen "
 "Paketdateien. Es entfernt alles außer der Sperrdatei aus "
 "<filename>&cachedir;/archives/</filename> und <filename>&cachedir;/archives/"
-"partial/</filename>. Wenn APT als eine &dselect;-Methode benutzt wird, wird "
-"<literal>clean</literal> automatisch ausgeführt. Diejenigen, die Dselect "
-"nicht benutzen, werden <literal>apt-get clean</literal> wahrscheinlich von "
-"Zeit zu Zeit ausführen, um Plattenplatz freizugeben."
+"partial/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:224
@@ -1087,13 +1268,6 @@ msgstr ""
 "installierte Version. Sie können jedoch die gleichen Optionen wie für den "
 "Befehl <option>install</option> angeben."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
-msgid "options"
-msgstr "Optionen"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:262
 msgid ""
@@ -1124,19 +1298,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:277
-#, fuzzy
-#| msgid ""
-#| "Fix; attempt to correct a system with broken dependencies in place. This "
-#| "option, when used with install/remove, can omit any packages to permit "
-#| "APT to deduce a likely solution. If packages are specified, these have to "
-#| "completely correct the problem. The option is sometimes necessary when "
-#| "running APT for the first time; APT itself does not allow broken package "
-#| "dependencies to exist on a system. It is possible that a system's "
-#| "dependency structure can be so corrupt as to require manual intervention "
-#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
-#| "to eliminate some of the offending packages). Use of this option together "
-#| "with <option>-m</option> may produce an error in some situations.  "
-#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -1158,11 +1319,11 @@ msgstr ""
 "Mal ausgeführt wird. APT selbst erlaubt es nicht, dass auf einen System "
 "beschädigte Paketabhängigkeiten existieren. Es ist möglich, dass eine "
 "Abhängigkeitsstruktur eines Systems so fehlerhaft ist, dass ein manuelles "
-"Eingreifen erforderlich ist (was normalerweise bedeutet, dass &dselect; oder "
-"<command>dpkg --remove</command> benutzt wird, um einige der fehlerhaften "
-"Pakete zu beseitigen). Wenn Sie die Option zusammen mit <option>-m</option> "
-"benutzen, könnte das in einigen Situationen zu Fehlern führen. "
-"Konfigurationselement: <literal>APT::Get::Fix-Broken</literal>."
+"Eingreifen erforderlich ist (was normalerweise bedeutet, dass <command>dpkg "
+"--remove</command> benutzt wird, um einige der fehlerhaften Pakete zu "
+"beseitigen). Wenn Sie die Option zusammen mit <option>-m</option> benutzen, "
+"könnte das in einigen Situationen zu Fehlern führen. Konfigurationselement: "
+"<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:292
@@ -1316,18 +1477,34 @@ msgid ""
 "satisfied. By default is it not set which means that the host architecture "
 "is the same as the build architecture (which is defined by <literal>APT::"
 "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>"
+"Architecture</literal>."
 msgstr ""
 "Diese Option steuert, wie die Architekturpakete durch <command>apt-get "
-"source --compile</command> gebaut und wie Cross-Bau-Abhängigkeiten erfüllt "
+"source --compile</command> gebaut und wie Cross-Bauabhängigkeiten erfüllt "
 "werden. Standardmäßig ist sie nicht gesetze, was bedeutet, dass die "
-"Rechnerarchitektur die gleiche wie die Bau-Architektur ist (die durch "
+"Rechnerarchitektur die gleiche wie die Bauarchitektur ist (die durch "
 "<literal>APT::Architecture</literal>) definiert wird). "
-"Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>"
+"Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:380
 msgid ""
+"This option controls the activated build profiles for which a source package "
+"is built by <command>apt-get source --compile</command> and how build "
+"dependencies are satisfied. By default no build profile is active.  More "
+"than one build profile can be activated at a time by concatenating them with "
+"a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
+msgstr ""
+"Diese Option steuert die aktivierten Bauprofile für die ein Quellpaket durch "
+"<command>apt-get source --compile</command> gebaut und wie Cross-"
+"Bauabhängigkeiten erfüllt werden. Standardmäßig ist kein Bauprofil aktiv. "
+"Ein weiteres Bauprofil kann gleichzeitig aktiviert werden, indem es durch "
+"ein Komma getrennt angehängt wird. Konfigurationselement: <literal>APT::"
+"Build-Profiles</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:391
+msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
@@ -1335,7 +1512,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:396
 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -1349,7 +1526,7 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:403
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1369,7 +1546,7 @@ msgstr ""
 "wird.Konfigurationselement: <literal>APT::Get::Upgrade-Allow-New</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:404
+#: apt-get.8.xml:415
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1383,7 +1560,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:411
+#: apt-get.8.xml:422
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1397,7 +1574,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:430
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -1412,7 +1589,7 @@ msgstr ""
 "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:438
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "
@@ -1434,7 +1611,7 @@ msgstr ""
 "Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:449
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1447,7 +1624,7 @@ msgstr ""
 "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:446
+#: apt-get.8.xml:457
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1456,7 +1633,7 @@ msgstr ""
 "Version haben. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:462
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1474,7 +1651,7 @@ msgstr ""
 "Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:461
+#: apt-get.8.xml:472
 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -1499,7 +1676,7 @@ msgstr ""
 "auch die &apt-preferences;-Handbuchseite."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:476
+#: apt-get.8.xml:487
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1513,7 +1690,7 @@ msgstr ""
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:494
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1522,7 +1699,7 @@ msgstr ""
 "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:500
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1536,7 +1713,7 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:507
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1555,7 +1732,7 @@ msgstr ""
 "Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:518
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1567,7 +1744,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:524
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1576,7 +1753,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:529
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1588,12 +1765,19 @@ msgstr ""
 
 # FIXME s/Item/Items/
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:535
+#, fuzzy
+#| msgid ""
+#| "Show user friendly progress information in the terminal window when "
+#| "packages are installed, upgraded or removed. For a machine parsable "
+#| "version of this data see README.progress-reporting in the apt doc "
+#| "directory.  Configuration Item: <literal>DpkgPM::Progress</literal> and "
+#| "<literal>Dpkg::Progress-Fancy</literal>."
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 "zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn "
@@ -1604,45 +1788,24 @@ msgstr ""
 "<literal>Dpkg::Progress-Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1200 apt_preferences.5.xml:700
+#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
+#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "Dateien"
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
-#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
-#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
-msgid "See Also"
-msgstr "Siehe auch"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:548
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
+#: apt-get.8.xml:559
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
 "APT Howto."
 msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, die APT-Benutzeranleitung in &guidesdir;, &apt-"
-"preferences;, das APT-Howto."
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
-msgid "Diagnostics"
-msgstr "Diagnose"
+"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
+"&apt-secure;, die APT-Benutzeranleitung in &guidesdir;, &apt-preferences;, "
+"das APT-Howto."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:565
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -3504,7 +3667,21 @@ msgstr ""
 "print-architectures</command> registriert werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:182
+msgid ""
+"List of all build profiles enabled for build-dependency resolution, without "
+"the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
+"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
+"buildpackage; overrides the list notation."
+msgstr ""
+"Liste aller Bauprofile ohne das Namensraum-Präfix »<literal>profile.</"
+"literal>«, die für die Auflösung der Bauabhängigkeiten aktiviert sind. "
+"Standardmäßig ist diese Liste leer. <envar>DEB_BUILD_PROFILES</envar> setzt "
+"so, wie es durch &dpkg-buildpackage; benutzt wird, die Listenschreibweise "
+"außer Kraft."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:190
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3517,7 +3694,7 @@ msgstr ""
 "codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:187
+#: apt.conf.5.xml:196
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3526,7 +3703,7 @@ msgstr ""
 "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:201
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3541,7 +3718,7 @@ msgstr ""
 "Möglichkeiten bereitstellt, um sie erneut zu installieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:209
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3569,7 +3746,7 @@ msgstr ""
 "Abhängigkeit von A nicht länger erfüllt wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:221
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3599,7 +3776,7 @@ msgstr ""
 "Stelle verhindern kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:234
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3617,7 +3794,7 @@ msgstr ""
 "des Upgrade-Prozesses arbeiten können."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:245
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3639,7 +3816,7 @@ msgstr ""
 "davon abhängt, sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:248
+#: apt.conf.5.xml:257
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3676,13 +3853,13 @@ msgstr ""
 "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:273
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "definiert, welche Pakete als essentielle Bauabhängigkeiten betrachtet werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:268
+#: apt.conf.5.xml:277
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3692,7 +3869,7 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:282
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3702,7 +3879,7 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:278
+#: apt.conf.5.xml:287
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3712,12 +3889,12 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:293
 msgid "The Acquire Group"
 msgstr "Die Erwerbgruppe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:294
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3728,7 +3905,7 @@ msgstr ""
 "Herunterladen selbst zuständig sind (siehe auch &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#: apt.conf.5.xml:301
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3750,7 +3927,7 @@ msgstr ""
 "ValidTime</literal> unten benutzt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:314
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3769,7 +3946,7 @@ msgstr ""
 "Anhängen der Archivbezeichnung an den Optionsnamen vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:317
+#: apt.conf.5.xml:326
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3789,7 +3966,7 @@ msgstr ""
 "Optionsnamen vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:338
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3800,7 +3977,7 @@ msgstr ""
 "der kompletten Dateien. Vorgabe ist True."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:341
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3818,7 +3995,7 @@ msgstr ""
 "komplette Datei anstelle der Patche heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:342
+#: apt.conf.5.xml:351
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3834,7 +4011,7 @@ msgstr ""
 "URI-Art geöffnet wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:350
+#: apt.conf.5.xml:359
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3843,7 +4020,7 @@ msgstr ""
 "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:364
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3853,7 +4030,7 @@ msgstr ""
 "kopiert zu werden. True ist die Vorgabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:369
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3872,7 +4049,7 @@ msgstr ""
 "wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:377
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3893,7 +4070,7 @@ msgstr ""
 "Zwischenspeicher mit (großen) .deb-Dateien verunreinigt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:378 apt.conf.5.xml:466
+#: apt.conf.5.xml:387 apt.conf.5.xml:475
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3903,7 +4080,7 @@ msgstr ""
 "Datenzeitüberschreitungen angewandt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:390
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3923,7 +4100,7 @@ msgstr ""
 "HTTP/1.1-Spezifikation entsprechen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:388
+#: apt.conf.5.xml:397
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3932,7 +4109,7 @@ msgstr ""
 "folgen wird, was standardmäßig aktiviert ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:400
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -3948,7 +4125,7 @@ msgstr ""
 "Zeit deaktiviert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:398
+#: apt.conf.5.xml:407
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3960,7 +4137,7 @@ msgstr ""
 "bekannten Bezeichner verwendet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -3983,7 +4160,7 @@ msgstr ""
 "dem veralteten Optionsnamen <literal>ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:429
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4000,7 +4177,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:437
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4041,7 +4218,7 @@ msgstr ""
 "Rechner ist <literal>&lt;host&gt;::SslForceVersion</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:458
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4076,7 +4253,7 @@ msgstr ""
 "literal> und <literal>$(SITE_PORT)</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:478
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -4093,7 +4270,7 @@ msgstr ""
 "Musterkonfigurationsdatei)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:485
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4107,7 +4284,7 @@ msgstr ""
 "Effizienz nicht empfohlen FTP über HTTP zu benutzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:490
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4123,13 +4300,13 @@ msgstr ""
 "Server RFC2428 unterstützen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:499
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4151,7 +4328,7 @@ msgstr ""
 "Aushängebefehle können per UMount angegeben werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:512
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4160,13 +4337,13 @@ msgstr ""
 "literal>, um zusätzliche Parameter an Gpgv weiterzuleiten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:523
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:518
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4186,19 +4363,19 @@ msgstr ""
 "\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:528
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:531
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:524
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4230,13 +4407,13 @@ msgstr ""
 "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:538
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:533
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4262,7 +4439,7 @@ msgstr ""
 "nicht überschreiben, es wird diesen Typ nur vor die Liste setzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:543
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4274,7 +4451,7 @@ msgstr ""
 "dies meist nur für lokale Spiegel benutzt werden kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:541
+#: apt.conf.5.xml:550
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4288,7 +4465,7 @@ msgstr ""
 "False."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:558
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4308,13 +4485,13 @@ msgstr ""
 "langen Sprachcodes selten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:575
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:563
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4355,7 +4532,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:576
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4369,22 +4546,22 @@ msgstr ""
 "Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr "Beim Herunterladen wird die Verwendung des IPv4-Protokolls erzwungen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:582
+#: apt.conf.5.xml:591
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr "Beim Herunterladen wird die Verwendung des IPv6-Protokolls erzwungen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:598
 msgid "Directories"
 msgstr "Verzeichnisse"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:600
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4404,7 +4581,7 @@ msgstr ""
 "nicht mit <filename>/</filename> oder <filename>./</filename> beginnen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:607
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4427,7 +4604,7 @@ msgstr ""
 "Standardverzeichnis in <literal>Dir::Cache</literal> enthalten."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:616
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4442,7 +4619,7 @@ msgstr ""
 "Konfigurationsdatei erfolgt)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:622
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4454,7 +4631,7 @@ msgstr ""
 "geladen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:626
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4472,7 +4649,7 @@ msgstr ""
 "Programms an."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:634
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4492,7 +4669,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:647
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4510,12 +4687,12 @@ msgstr ""
 "diese Muster verwandt werden."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:656
 msgid "APT in DSelect"
 msgstr "APT in DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:658
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4526,7 +4703,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:663
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4549,7 +4726,7 @@ msgstr ""
 "vor dem Herunterladen neuer Pakete durch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4558,7 +4735,7 @@ msgstr ""
 "übermittelt, wenn es für die Installationsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:682
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4567,7 +4744,7 @@ msgstr ""
 "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:678
+#: apt.conf.5.xml:687
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4576,12 +4753,12 @@ msgstr ""
 "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:693
 msgid "How APT calls &dpkg;"
 msgstr "Wie APT &dpkg; aufruft"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:694
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4590,7 +4767,7 @@ msgstr ""
 "stehen im Abschnitt <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:699
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4601,7 +4778,7 @@ msgstr ""
 "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:696
+#: apt.conf.5.xml:705
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4615,7 +4792,7 @@ msgstr ""
 "APT abgebrochen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:712
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4634,7 +4811,7 @@ msgstr ""
 "übergeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:719
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4647,7 +4824,7 @@ msgstr ""
 "Version die Architektur und den <literal>MultiArch</literal>-Schalter hinzu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:724
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4665,7 +4842,7 @@ msgstr ""
 "bietet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:731
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4683,7 +4860,7 @@ msgstr ""
 "verwendeten Dateideskriptors als eine Bestätigung."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:741
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4692,7 +4869,7 @@ msgstr ""
 "die Vorgabe ist <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:746
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4702,12 +4879,12 @@ msgstr ""
 "Programme werden erstellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:751
 msgid "dpkg trigger usage (and related options)"
 msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:752
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4734,7 +4911,7 @@ msgstr ""
 "Pakete konfiguriert werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:767
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4748,7 +4925,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:761
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4773,7 +4950,7 @@ msgstr ""
 "Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:774
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4796,7 +4973,7 @@ msgstr ""
 "anhängen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:782
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4826,7 +5003,7 @@ msgstr ""
 "enden könnte und möglicherweise nicht mehr startbar ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:797
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4845,7 +5022,7 @@ msgstr ""
 "deaktivieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:804
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4861,7 +5038,7 @@ msgstr ""
 "benötigt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:817
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4879,7 +5056,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:810
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4903,12 +5080,12 @@ msgstr ""
 "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:830
 msgid "Periodic and Archives options"
 msgstr "Periodische- und Archivoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:831
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4922,12 +5099,12 @@ msgstr ""
 "Dokumentation dieser Optionen zu erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:839
 msgid "Debug options"
 msgstr "Fehlersuchoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:841
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4945,7 +5122,7 @@ msgstr ""
 "könnten es sein:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:852
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4956,7 +5133,7 @@ msgstr ""
 "getroffenen Entscheidungen ein."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:860
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4967,7 +5144,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:869
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4979,7 +5156,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:877
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4988,12 +5165,12 @@ msgstr ""
 "Daten in CD-ROM-IDs aus."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:887
 msgid "A full list of debugging options to apt follows."
 msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:896
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5001,28 +5178,28 @@ msgstr ""
 "literal>-Quellen beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:907
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:918
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:929
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:940
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5031,7 +5208,7 @@ msgstr ""
 "mittels <literal>gpg</literal> beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:951
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5040,13 +5217,13 @@ msgstr ""
 "CD-ROMs gespeichert sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:961
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:971
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5055,7 +5232,7 @@ msgstr ""
 "Bibliotheken generiert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:981
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5066,7 +5243,7 @@ msgstr ""
 "ID für eine CD-ROM generiert wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:992
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5076,14 +5253,14 @@ msgstr ""
 "gleichen Zeit laufen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1004
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "protokolliert, wenn Elemente aus der globalen Warteschlange zum "
 "Herunterladen hinzugefügt oder entfernt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1014
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5092,7 +5269,7 @@ msgstr ""
 "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1024
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5101,7 +5278,7 @@ msgstr ""
 "Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1036
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5111,7 +5288,7 @@ msgstr ""
 "werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1047
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5119,7 +5296,7 @@ msgstr ""
 "durchführen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1049
+#: apt.conf.5.xml:1058
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5129,7 +5306,7 @@ msgstr ""
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1059
+#: apt.conf.5.xml:1068
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5145,7 +5322,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1082
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5178,7 +5355,7 @@ msgstr ""
 "dem das Paket erscheint."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1094
+#: apt.conf.5.xml:1103
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5188,7 +5365,7 @@ msgstr ""
 "sind, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1114
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5197,7 +5374,7 @@ msgstr ""
 "und alle während deren Auswertung gefundenen Fehler aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1125
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5207,7 +5384,7 @@ msgstr ""
 "soll."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1137
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5215,12 +5392,12 @@ msgstr ""
 "von &dpkg; ausgeführt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1139
+#: apt.conf.5.xml:1148
 msgid "Output the priority of each package list on startup."
 msgstr "gibt die Priorität jeder Paketliste beim Start aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1149
+#: apt.conf.5.xml:1158
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5230,7 +5407,7 @@ msgstr ""
 "aufgetreten ist)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1160
+#: apt.conf.5.xml:1169
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5242,7 +5419,7 @@ msgstr ""
 "Marker</literal> beschrieben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1172
+#: apt.conf.5.xml:1181
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5250,14 +5427,22 @@ msgstr ""
 "gibt die Informationen über die in <filename>/etc/apt/vendors.list</"
 "filename> gelesenen Anbieter aus."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:1191
+msgid ""
+"Display the external commands that are called by apt hooks.  This includes e."
+"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Beispiele"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1195
+#: apt.conf.5.xml:1216
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5267,7 +5452,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1207
+#: apt.conf.5.xml:1228
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -7273,14 +7458,14 @@ msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
-"filenames of the form <filename>package.template.XXXX</filename> and "
-"<filename>package.config.XXXX</filename>"
+"filenames of the form <filename>package.template.XXXXXX</filename> and "
+"<filename>package.config.XXXXXX</filename>"
 msgstr ""
 "Schablonendatei und Konfigurationsskript werden in das temporäre Verzeichnis "
 "geschrieben, das durch das Verzeichnis <option>-t</option> oder <option>--"
 "tempdir</option> (<literal>APT::ExtractTemplates::TempDir</literal>) mit "
-"Dateinamen der Form <filename>package. template.XXXX</filename> und "
-"<filename>package.config.XXXX</filename> angegeben wurde."
+"Dateinamen der Form <filename>package. template.XXXXXX</filename> und "
+"<filename>package.config.XXXXXX</filename> angegeben wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:60
@@ -8317,124 +8502,6 @@ msgstr ""
 "<command>apt-ftparchive</command> gibt bei normalen Operationen 0 zurück, "
 "dezimal 100 bei Fehlern."
 
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "apt"
-msgstr "apt"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "16 June 1998"
-msgstr "16. Juni 1998"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "Debian"
-msgstr "Debian"
-
-#. type: SH
-#: apt.8:18
-#, no-wrap
-msgid "NAME"
-msgstr "NAME"
-
-#. type: Plain text
-#: apt.8:20
-msgid "apt - Advanced Package Tool"
-msgstr "apt - Fortschrittliches Paketwerkzeug (Advanced Package Tool)"
-
-#. type: SH
-#: apt.8:20
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr "ÜBERSICHT"
-
-#. type: Plain text
-#: apt.8:22
-msgid "B<apt>"
-msgstr "B<apt>"
-
-#. type: SH
-#: apt.8:22
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr "BESCHREIBUNG"
-
-#. type: Plain text
-#: apt.8:31
-msgid ""
-"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-"System. Some options are only implemented in B<apt-get>(8)  though."
-msgstr ""
-"APT ist ein Verwaltungssystem für Softwarepakete. Für normale alltägliche "
-"Paketverwaltung sind mehrere Oberflächen, wie B<aptitude>(8) für die "
-"Befehlszeile oder B<synaptic>(8) für das X-Window-System, verfügbar. Einige "
-"Optionen sind jedoch nur in B<apt-get>(8) implementiert."
-
-#. type: SH
-#: apt.8:31
-#, no-wrap
-msgid "SEE ALSO"
-msgstr "SIEHE AUCH"
-
-#. type: Plain text
-#: apt.8:38
-msgid ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-msgstr ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-
-#. type: SH
-#: apt.8:38
-#, no-wrap
-msgid "DIAGNOSTICS"
-msgstr "DIAGNOSE"
-
-#. type: Plain text
-#: apt.8:40
-msgid "apt returns zero on normal operation, decimal 100 on error."
-msgstr "APT gibt bei normalen Operationen 0 zurück, dezimal 100 bei Fehlern."
-
-#. type: SH
-#: apt.8:40
-#, no-wrap
-msgid "BUGS"
-msgstr "FEHLER"
-
-#. type: Plain text
-#: apt.8:42
-msgid "This manpage isn't even started."
-msgstr "Diese Handbuchseite wurde noch nicht mal begonnen."
-
-#. type: Plain text
-#: apt.8:51
-msgid ""
-"See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-"B<reportbug>(1)  command."
-msgstr ""
-"siehe auch E<lt>http://bugs.debian.org/aptE<gt>. Wenn Sie einen Fehler in "
-"B<apt> berichten möchten, sehen Sie sich bitte I</usr/share/doc/debian/bug-"
-"reporting.txt> oder den Befehl B<reportbug>(1) an."
-
-#. type: SH
-#: apt.8:51
-#, no-wrap
-msgid "AUTHOR"
-msgstr "AUTOR"
-
-#. type: Plain text
-#: apt.8:52
-msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-msgstr "APT wurde vom APT-Team E<lt>apt@packages.debian.orgE<gt> geschrieben."
-
 #. type: <title></title>
 #: guide.sgml:4
 msgid "APT User's Guide"
@@ -8772,7 +8839,7 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+#| "in its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
 #| "option is <tt>-d</tt> which does not install the fetched files. If the "
 #| "system has to download a large number of package it would be undesired to "
 #| "start installing them in case something goes wrong. When <tt>-d</tt> is "
@@ -8788,7 +8855,7 @@ msgid ""
 "caused them to be downloaded again without <tt>-d</tt>."
 msgstr ""
 "<prgn>apt-get</prgn> hat mehrere Befehlszeilenoptionen, die sich detailliert "
-"in dessen Handbuchseite, <manref section=\"8\" name=\"apt-get\"> finden. Die "
+"in dessen Handbuchseite, <manref name=\"apt-get\" section=\"8\"> finden. Die "
 "nützlichste Option ist <tt>-d</tt>, die die heruntergeladenen Dateien nicht "
 "installiert. Falls das System eine große Anzahl Pakete herunterladen soll, "
 "würde es nicht erwünscht sein, wenn die Installation in dem Fall gestartet "
@@ -10017,3 +10084,87 @@ msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
 #: offline.sgml:234
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
+
+#~ msgid "apt"
+#~ msgstr "apt"
+
+#~ msgid "16 June 1998"
+#~ msgstr "16. Juni 1998"
+
+#~ msgid "Debian"
+#~ msgstr "Debian"
+
+#~ msgid "NAME"
+#~ msgstr "NAME"
+
+#~ msgid "apt - Advanced Package Tool"
+#~ msgstr "apt - Fortschrittliches Paketwerkzeug (Advanced Package Tool)"
+
+#~ msgid "SYNOPSIS"
+#~ msgstr "ÜBERSICHT"
+
+#~ msgid "B<apt>"
+#~ msgstr "B<apt>"
+
+#~ msgid "DESCRIPTION"
+#~ msgstr "BESCHREIBUNG"
+
+#, fuzzy
+#~| msgid ""
+#~| "APT is a management system for software packages. For normal day to day "
+#~| "package management there are several frontends available, such as "
+#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+#~| "System. Some options are only implemented in B<apt-get>(8)  though."
+#~ msgid ""
+#~ "For normal day to day package management there are several frontends "
+#~ "available, such as B<aptitude>(8)  for the command line or "
+#~ "B<synaptic>(8)  for the X Window System. Some options are only "
+#~ "implemented in B<apt-get>(8)  though."
+#~ msgstr ""
+#~ "APT ist ein Verwaltungssystem für Softwarepakete. Für normale alltägliche "
+#~ "Paketverwaltung sind mehrere Oberflächen, wie B<aptitude>(8) für die "
+#~ "Befehlszeile oder B<synaptic>(8) für das X-Window-System, verfügbar. "
+#~ "Einige Optionen sind jedoch nur in B<apt-get>(8) implementiert."
+
+#~ msgid "SEE ALSO"
+#~ msgstr "SIEHE AUCH"
+
+#, fuzzy
+#~| msgid ""
+#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~| "B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgid ""
+#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
+#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgstr ""
+#~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~ "B<apt_preferences>(5), B<apt-secure>(8)"
+
+#~ msgid "DIAGNOSTICS"
+#~ msgstr "DIAGNOSE"
+
+#~ msgid "apt returns zero on normal operation, decimal 100 on error."
+#~ msgstr ""
+#~ "APT gibt bei normalen Operationen 0 zurück, dezimal 100 bei Fehlern."
+
+#~ msgid "BUGS"
+#~ msgstr "FEHLER"
+
+#~ msgid "This manpage isn't even started."
+#~ msgstr "Diese Handbuchseite wurde noch nicht mal begonnen."
+
+#~ msgid ""
+#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
+#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "B<reportbug>(1)  command."
+#~ msgstr ""
+#~ "siehe auch E<lt>http://bugs.debian.org/aptE<gt>. Wenn Sie einen Fehler in "
+#~ "B<apt> berichten möchten, sehen Sie sich bitte I</usr/share/doc/debian/"
+#~ "bug-reporting.txt> oder den Befehl B<reportbug>(1) an."
+
+#~ msgid "AUTHOR"
+#~ msgstr "AUTOR"
+
+#~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
+#~ msgstr ""
+#~ "APT wurde vom APT-Team E<lt>apt@packages.debian.orgE<gt> geschrieben."
diff --git a/doc/po/es.po b/doc/po/es.po
index bcf0ccf51..2cf3a070a 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
-"PO-Revision-Date: 2012-07-14 12:21+0200\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "Language: es\n"
@@ -699,34 +699,266 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27 apt-mark.8.xml:28
-#: apt-secure.8.xml:27 apt-cdrom.8.xml:27 apt-config.8.xml:28
+#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
+#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
+#: apt-config.8.xml:28
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28 apt-mark.8.xml:29
-#: apt-secure.8.xml:28 apt-cdrom.8.xml:28 apt-config.8.xml:29
-#: apt.conf.5.xml:34 apt_preferences.5.xml:28 sources.list.5.xml:29
-#: apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29 apt-ftparchive.1.xml:29
+#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
+#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
+#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
+#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
+#: apt-ftparchive.1.xml:29
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
-msgid "APT package handling utility -- command-line interface"
+#: apt.8.xml:32
+msgid "command-line interface"
 msgstr ""
-"Herramienta de gestión de paquetes APT -- interfaz para la línea de órdenes"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 apt-mark.8.xml:40
-#: apt-secure.8.xml:52 apt-cdrom.8.xml:39 apt-config.8.xml:40
-#: apt.conf.5.xml:43 apt_preferences.5.xml:38 sources.list.5.xml:38
-#: apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40 apt-ftparchive.1.xml:40
+#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
+#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
+#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
+#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
+#: apt-ftparchive.1.xml:40
 msgid "Description"
 msgstr "Descripción"
 
 #. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:38
+msgid ""
+"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
+"handling packages. It provides a commandline interface for the package "
+"management of the system.  See also &apt-get; and &apt-cache; for more low-"
+"level command options."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:47
+msgid ""
+"<literal>list</literal> is used to display a list of packages. It supports "
+"shell pattern for matching package names and the following options: "
+"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"versions</option> are supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:58
+msgid ""
+"<literal>search</literal> searches for the given term(s) and display "
+"matching packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:64
+#, fuzzy
+#| msgid ""
+#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
+#| "package has."
+msgid ""
+"<literal>show</literal> shows the package information for the given "
+"package(s)."
+msgstr ""
+"<literal>rdepends</literal> muestra las dependencias inversas de un paquete."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:71
+msgid ""
+"<literal>install</literal> is followed by one or more package names desired "
+"for installation or upgrading."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:75 apt-get.8.xml:118
+msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"Puede seleccionar una versión especifica de un paquete poniendo a "
+"continuación del nombre del paquete un símbolo igual («=») seguido de la "
+"versión deseada. Esto provocará que se localice y seleccione esa versión "
+"para su instalación. Alternativamente se puede seleccionar una distribución "
+"específica poniendo a continuación del nombre del paquete una barra («/») "
+"seguida de la versión de la distribución o su nombre en el archivo de Debian "
+"(stable, testing, unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:85 apt-get.8.xml:153
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> se comporta del mismo modo que <literal>install</"
+"literal> con la diferencia de que elimina los paquetes en vez de "
+"instalarlos. Tenga en cuenta que al eliminar un paquete sus ficheros de "
+"configuración permanecen en el sistema. Si un signo de suma precede al "
+"nombre del paquete (sin ningún espacio en blanco entre los dos), el paquete "
+"en cuestión será instalado en vez de eliminado."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:93
+msgid ""
+"<literal>edit-sources</literal> lets you edit your sources.list file and "
+"provides basic sanity checks."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:99
+#, fuzzy
+#| msgid ""
+#| "<literal>showhold</literal> is used to print a list of packages on hold "
+#| "in the same way as for the other show commands."
+msgid ""
+"<literal>update</literal> is used to resynchronize the package index files "
+"from their sources."
+msgstr ""
+"<literal>showhold</literal> muestra una lista de paquetes retenidos («hold») "
+"de la misma forma que las otras órdenes «show»."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:105
+msgid ""
+"<literal>upgrade</literal> is used to install the newest versions of all "
+"packages currently installed on the system from the sources enumerated in "
+"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
+"but existing package will never removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:114
+msgid ""
+"<literal>full-upgrade</literal> performs the function of upgrade but may "
+"also remove installed packages if that is required in order to resolve a "
+"package conflict."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
+#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
+#: apt-ftparchive.1.xml:506
+msgid "options"
+msgstr "Opciones"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:134
+msgid "Script usage"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:136
+msgid ""
+"The &apt; commandline is designed as a end-user tool and it may change the "
+"output between versions. While it tries to not break backward compatibility "
+"there is no guarantee for it either.  All features of &apt; are available in "
+"&apt-cache; and &apt-get; via APT options. Please prefer using these "
+"commands in your scripts."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:144
+msgid "Differences to &apt-get;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:145
+msgid ""
+"The <command>apt</command> command is meant to be pleasant for end users and "
+"does not need to be backward compatible like &apt-get;. Therefore some "
+"options are different:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:151
+#, fuzzy
+#| msgid "the <literal>Package:</literal> line"
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgstr "La línea <literal>Package:</literal>"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:155
+#, fuzzy
+#| msgid "the <literal>Component:</literal> line"
+msgid "The option <literal>APT::Color</literal> is enabled."
+msgstr "La línea <literal>Component:</literal>"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:159
+msgid ""
+"A new <literal>list</literal> command is available similar to <literal>dpkg "
+"--list</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:164
+#, fuzzy
+#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+msgid ""
+"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
+"enabled by default."
+msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
+#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
+#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
+#: apt-ftparchive.1.xml:609
+msgid "See Also"
+msgstr "Véase también"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:175
+#, fuzzy
+#| msgid ""
+#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
+#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
+#| "preferences;, the APT Howto."
+msgid ""
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
+"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
+msgstr ""
+"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
+"&apt-config;, &apt-secure;, la guía de usuario de APT en &guidesdir;, &apt-"
+"preferences;, el Cómo de APT."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
+#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
+#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+msgid "Diagnostics"
+msgstr "Diagnósticos"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:181
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
+#| "on error."
+msgid ""
+"<command>apt</command> returns zero on normal operation, decimal 100 on "
+"error."
+msgstr ""
+"<command>apt-get</command> devuelve cero si no hay ningún error, y el valor "
+"100 en caso de error."
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-get.8.xml:35
+msgid "APT package handling utility -- command-line interface"
+msgstr ""
+"Herramienta de gestión de paquetes APT -- interfaz para la línea de órdenes"
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:41
 #, fuzzy
 #| msgid ""
@@ -878,24 +1110,6 @@ msgstr ""
 "de apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:118
-msgid ""
-"A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
-msgstr ""
-"Puede seleccionar una versión especifica de un paquete poniendo a "
-"continuación del nombre del paquete un símbolo igual («=») seguido de la "
-"versión deseada. Esto provocará que se localice y seleccione esa versión "
-"para su instalación. Alternativamente se puede seleccionar una distribución "
-"específica poniendo a continuación del nombre del paquete una barra («/») "
-"seguida de la versión de la distribución o su nombre en el archivo de Debian "
-"(stable, testing, unstable)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:125
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
@@ -954,22 +1168,6 @@ msgstr ""
 "«$», o bien crear una expresión regular más específica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:153
-msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"<literal>remove</literal> se comporta del mismo modo que <literal>install</"
-"literal> con la diferencia de que elimina los paquetes en vez de "
-"instalarlos. Tenga en cuenta que al eliminar un paquete sus ficheros de "
-"configuración permanecen en el sistema. Si un signo de suma precede al "
-"nombre del paquete (sin ningún espacio en blanco entre los dos), el paquete "
-"en cuestión será instalado en vez de eliminado."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:161
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
@@ -1168,13 +1366,6 @@ msgstr ""
 "parte, puede definir las mismas opciones que con la orden <option>install</"
 "option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
-msgid "options"
-msgstr "Opciones"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:262
 msgid ""
@@ -1386,13 +1577,21 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:370
+#, fuzzy
+#| msgid ""
+#| "This option controls the architecture packages are built for by "
+#| "<command>apt-get source --compile</command> and how cross-"
+#| "builddependencies are satisfied. By default is it not set which means "
+#| "that the host architecture is the same as the build architecture (which "
+#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
+#| "<literal>APT::Get::Host-Architecture</literal>"
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
 "is the same as the build architecture (which is defined by <literal>APT::"
 "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>"
+"Architecture</literal>."
 msgstr ""
 "Esta opción controla la arquitectura para la que se construyen los paquetes "
 "mediante <command>apt-get source --compile</command> y cómo se satisfacen "
@@ -1403,6 +1602,30 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:380
+#, fuzzy
+#| msgid ""
+#| "This option controls the architecture packages are built for by "
+#| "<command>apt-get source --compile</command> and how cross-"
+#| "builddependencies are satisfied. By default is it not set which means "
+#| "that the host architecture is the same as the build architecture (which "
+#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
+#| "<literal>APT::Get::Host-Architecture</literal>"
+msgid ""
+"This option controls the activated build profiles for which a source package "
+"is built by <command>apt-get source --compile</command> and how build "
+"dependencies are satisfied. By default no build profile is active.  More "
+"than one build profile can be activated at a time by concatenating them with "
+"a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
+msgstr ""
+"Esta opción controla la arquitectura para la que se construyen los paquetes "
+"mediante <command>apt-get source --compile</command> y cómo se satisfacen "
+"las dependencias cruzadas de construcción. No se define por omisión, lo que "
+"implica que la arquitectura anfitrión es la misma que la de construcción "
+"(definida con <literal>APT::Architecture</literal>).  Opción de "
+"configuración: <literal>APT::Get::Host-Architecture</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:391
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1411,7 +1634,7 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:396
 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -1425,7 +1648,7 @@ msgstr ""
 "Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:403
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1437,7 +1660,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:404
+#: apt-get.8.xml:415
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1450,7 +1673,7 @@ msgstr ""
 "configuración: <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:411
+#: apt-get.8.xml:422
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1464,7 +1687,7 @@ msgstr ""
 "<literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:430
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -1480,7 +1703,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:438
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "
@@ -1502,7 +1725,7 @@ msgstr ""
 "<literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:449
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1516,7 +1739,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:446
+#: apt-get.8.xml:457
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1526,7 +1749,7 @@ msgstr ""
 "ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:462
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1544,7 +1767,7 @@ msgstr ""
 "<literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:461
+#: apt-get.8.xml:472
 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -1568,7 +1791,7 @@ msgstr ""
 "también la página del manual de &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:476
+#: apt-get.8.xml:487
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1582,7 +1805,7 @@ msgstr ""
 "<literal>APT::Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:494
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1591,7 +1814,7 @@ msgstr ""
 "preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:500
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1604,7 +1827,7 @@ msgstr ""
 "Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:507
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1624,7 +1847,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:518
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1635,7 +1858,7 @@ msgstr ""
 "Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:524
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1644,7 +1867,7 @@ msgstr ""
 "arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:529
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1655,32 +1878,23 @@ msgstr ""
 "configuración: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:535
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1200 apt_preferences.5.xml:700
+#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
+#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "Ficheros"
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
-#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
-#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
-msgid "See Also"
-msgstr "Véase también"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:559
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1695,15 +1909,8 @@ msgstr ""
 "&apt-config;, &apt-secure;, la guía de usuario de APT en &guidesdir;, &apt-"
 "preferences;, el Cómo de APT."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
-msgid "Diagnostics"
-msgstr "Diagnósticos"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:565
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -3551,7 +3758,16 @@ msgstr ""
 "add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:182
+msgid ""
+"List of all build profiles enabled for build-dependency resolution, without "
+"the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
+"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
+"buildpackage; overrides the list notation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:190
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3565,7 +3781,7 @@ msgstr ""
 "«5.0*». Consulte también &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:187
+#: apt.conf.5.xml:196
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3574,7 +3790,7 @@ msgstr ""
 "problemas ignore los paquetes retenidos en la toma de decisiones."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:201
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3588,7 +3804,7 @@ msgstr ""
 "mecanismo directo para reinstalarlos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:209
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3615,7 +3831,7 @@ msgstr ""
 "del paquete A, ya que no se satisface la dependencia sobre éste."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:221
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3644,7 +3860,7 @@ msgstr ""
 "anteriormente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:234
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3661,7 +3877,7 @@ msgstr ""
 "para que así pueden mejorar y corregir el proceso de actualización."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:245
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3682,7 +3898,7 @@ msgstr ""
 "sobre la que estos paquetes dependen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:248
+#: apt.conf.5.xml:257
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3719,14 +3935,14 @@ msgstr ""
 "desactiva el crecimiento automático de la caché."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:273
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Define los paquetes que se consideran dependencias de construcción "
 "esenciales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:268
+#: apt.conf.5.xml:277
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3735,7 +3951,7 @@ msgstr ""
 "documentación para más información sobre esta opción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:282
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3744,7 +3960,7 @@ msgstr ""
 "documentación para más información sobre esta opción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:278
+#: apt.conf.5.xml:287
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3753,12 +3969,12 @@ msgstr ""
 "documentación para más información sobre esta opción."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:293
 msgid "The Acquire Group"
 msgstr "El grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:294
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3769,7 +3985,7 @@ msgstr ""
 "sí mismo (consulte también &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#: apt.conf.5.xml:301
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3790,7 +4006,7 @@ msgstr ""
 "utilizar la opción <literal>Max-ValidTime</literal> a continuación."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:314
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3809,7 +4025,7 @@ msgstr ""
 "se pueden realizar añadiendo la etiqueta del archivo al nombre de opción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:317
+#: apt.conf.5.xml:326
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3829,7 +4045,7 @@ msgstr ""
 "y deben utilizar añadiendo la etiqueta del archivo al nombre de opción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:338
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3840,7 +4056,7 @@ msgstr ""
 "enteros. Su valor predeterminado es «true»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:341
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3858,7 +4074,7 @@ msgstr ""
 "parches."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:342
+#: apt.conf.5.xml:351
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3873,7 +4089,7 @@ msgstr ""
 "se abrirá una conexión por cada tipo de URI."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:350
+#: apt.conf.5.xml:359
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3882,7 +4098,7 @@ msgstr ""
 "intentar obtener los ficheros fallidos el número de veces proporcionado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:364
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3892,7 +4108,7 @@ msgstr ""
 "«true» de forma predeterminada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:369
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3912,7 +4128,7 @@ msgstr ""
 "opciones anteriores."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:377
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3931,7 +4147,7 @@ msgstr ""
 "impedir que el proxy contamine la caché con ficheros «.deb» (de gran tamaño)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:378 apt.conf.5.xml:466
+#: apt.conf.5.xml:387 apt.conf.5.xml:475
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3941,7 +4157,7 @@ msgstr ""
 "y a la recepción de datos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:390
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3961,7 +4177,7 @@ msgstr ""
 "cumplir la especificación HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:388
+#: apt.conf.5.xml:397
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3970,7 +4186,7 @@ msgstr ""
 "redirección; activado por omisión."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:400
 #, fuzzy
 #| msgid ""
 #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
@@ -3992,7 +4208,7 @@ msgstr ""
 "implícitamente la descarga simultánea desde varios servidores)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:398
+#: apt.conf.5.xml:407
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -4003,7 +4219,7 @@ msgstr ""
 "permiten el acceso para clientes que usan un identificador conocido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -4017,7 +4233,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:429
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4034,7 +4250,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:437
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4074,7 +4290,7 @@ msgstr ""
 "SslForceVersion</literal> es la opción correspondiente para cada servidor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:458
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4107,7 +4323,7 @@ msgstr ""
 "<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:478
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -4124,7 +4340,7 @@ msgstr ""
 "ejemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:485
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4138,7 +4354,7 @@ msgstr ""
 "a su poca eficiencia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:490
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4154,13 +4370,13 @@ msgstr ""
 "compatibles con la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"algo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:499
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4182,7 +4398,7 @@ msgstr ""
 "especificar órdenes para desmontar mediante UMount."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:512
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4191,13 +4407,13 @@ msgstr ""
 "Options</literal>, que introduce parámetros adicionales a gpgv."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:523
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:518
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4217,19 +4433,19 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:528
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:531
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:524
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4261,13 +4477,13 @@ msgstr ""
 "explícita ya que se añadirá de forma automática."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:538
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:533
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4292,7 +4508,7 @@ msgstr ""
 "omite la lista definida, simplemente prefija la lista con este tipo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:543
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4304,7 +4520,7 @@ msgstr ""
 "así que habitualmente esto solo sirve con réplicas locales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:541
+#: apt.conf.5.xml:550
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4318,7 +4534,7 @@ msgstr ""
 "paquetes locales. El valor predeterminado es «false»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:558
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4337,13 +4553,13 @@ msgstr ""
 "idioma (especialmente para los códigos de idioma largos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:575
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:563
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4382,7 +4598,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:576
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4396,22 +4612,22 @@ msgstr ""
 "implícito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:582
+#: apt.conf.5.xml:591
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:598
 msgid "Directories"
 msgstr "Directorios"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:600
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4432,7 +4648,7 @@ msgstr ""
 "filename> ó <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:607
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4454,7 +4670,7 @@ msgstr ""
 "directorio predeterminado está en <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:616
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4470,7 +4686,7 @@ msgstr ""
 "<envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:622
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4481,7 +4697,7 @@ msgstr ""
 "Al finalizar este proceso carga el fichero de configuración principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:626
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4498,7 +4714,7 @@ msgstr ""
 "literal> especifican la ubicación de sus respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:634
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4519,7 +4735,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:647
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4537,12 +4753,12 @@ msgstr ""
 "de expresiones regulares."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:656
 msgid "APT in DSelect"
 msgstr "APT con DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:658
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4553,7 +4769,7 @@ msgstr ""
 "encuentran en la sección <literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:663
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4575,7 +4791,7 @@ msgstr ""
 "realiza esta acción antes de descargar paquetes nuevos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4584,7 +4800,7 @@ msgstr ""
 "la línea de ordenes al ejecutar la fase de instalación."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:682
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4593,7 +4809,7 @@ msgstr ""
 "la línea de ordenes al ejecutar la fase de actualización."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:678
+#: apt.conf.5.xml:687
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4603,12 +4819,12 @@ msgstr ""
 "preguntará en caso de error."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:693
 msgid "How APT calls &dpkg;"
 msgstr "Invocación de APT a dpkg"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:694
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4617,7 +4833,7 @@ msgstr ""
 "se encuentran en la sección <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:699
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4628,7 +4844,7 @@ msgstr ""
 "introduce a &dpkg; como un sólo argumento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:696
+#: apt.conf.5.xml:705
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4641,7 +4857,7 @@ msgstr ""
 "sh</filename>; en caso de fallo, APT cancela la acción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:712
 #, fuzzy
 #| msgid ""
 #| "This is a list of shell commands to run before invoking &dpkg;. Like "
@@ -4665,7 +4881,7 @@ msgstr ""
 "la entrada estándar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:719
 #, fuzzy
 #| msgid ""
 #| "Version 2 of this protocol dumps more information, including the protocol "
@@ -4687,7 +4903,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:724
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4698,7 +4914,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:731
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4709,7 +4925,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:741
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4718,7 +4934,7 @@ msgstr ""
 "predeterminado es <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:746
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4728,12 +4944,12 @@ msgstr ""
 "paquetes y a producir todos los binarios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:751
 msgid "dpkg trigger usage (and related options)"
 msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:752
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4760,7 +4976,7 @@ msgstr ""
 "tiempo (o más) durante la configuración de todos los paquetes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:767
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4774,7 +4990,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:761
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4798,7 +5014,7 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:774
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4821,7 +5037,7 @@ msgstr ""
 "eliminación."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:782
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4851,7 +5067,7 @@ msgstr ""
 "imposibilidad de arrancar el sistema. "
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:797
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4869,7 +5085,7 @@ msgstr ""
 "desactivar esta opción en todas las ejecuciones menos la última."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:804
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4885,7 +5101,7 @@ msgstr ""
 "los disparadores necesarios para configurar este paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:817
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4903,7 +5119,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:810
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4928,12 +5144,12 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:830
 msgid "Periodic and Archives options"
 msgstr "Las opciones «Periodic» y «Archives»"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:831
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4947,12 +5163,12 @@ msgstr ""
 "documentación de estas opciones."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:839
 msgid "Debug options"
 msgstr "Opciones de depuración"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:841
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4969,7 +5185,7 @@ msgstr ""
 "para un usuario normal, aunque unas cuantas sí son:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:852
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4980,7 +5196,7 @@ msgstr ""
 "purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:860
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4991,7 +5207,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como un usuario normal."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:869
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5003,7 +5219,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:877
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5012,14 +5228,14 @@ msgstr ""
 "statfs en los identificadores de los discos ópticos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:887
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 "A continuación, se muestra la lista completa de las opciones de depuración "
 "de apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:896
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5027,26 +5243,26 @@ msgstr ""
 "<literal>cdrom://</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:907
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:918
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:929
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante "
 "HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:940
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5055,7 +5271,7 @@ msgstr ""
 "criptográficas mediante <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:951
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5064,14 +5280,14 @@ msgstr ""
 "paquetes almacenadas en CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:961
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Describe el proceso de resolución de dependencias de compilación en &apt-"
 "get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:971
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5080,7 +5296,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:981
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5091,7 +5307,7 @@ msgstr ""
 "identificador de un CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:992
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5101,14 +5317,14 @@ msgstr ""
 "a la vez."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1004
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Registra los elementos que se añaden o se borran de la cola de descarga "
 "global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1014
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5118,7 +5334,7 @@ msgstr ""
 "ficheros descargados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1024
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5127,7 +5343,7 @@ msgstr ""
 "lista de índices de paquetes, y los errores relacionados con éstos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1036
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5137,7 +5353,7 @@ msgstr ""
 "índices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1047
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5145,7 +5361,7 @@ msgstr ""
 "descargas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1049
+#: apt.conf.5.xml:1058
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5154,7 +5370,7 @@ msgstr ""
 "de los paquetes y con la eliminación de los paquetes sin usar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1059
+#: apt.conf.5.xml:1068
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5170,7 +5386,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1082
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5201,7 +5417,7 @@ msgstr ""
 "la sección en la que aparece el paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1094
+#: apt.conf.5.xml:1103
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5210,7 +5426,7 @@ msgstr ""
 "invocó, con los argumentos separados por un espacio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1114
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5219,7 +5435,7 @@ msgstr ""
 "estado y cualquier error encontrado durante el análisis."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1125
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5228,7 +5444,7 @@ msgstr ""
 "literal> debería entregar los paquetes a &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1137
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5236,12 +5452,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1139
+#: apt.conf.5.xml:1148
 msgid "Output the priority of each package list on startup."
 msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1149
+#: apt.conf.5.xml:1158
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5250,7 +5466,7 @@ msgstr ""
 "lo que ocurre cuando se encuentra un problema de dependencias complejo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1160
+#: apt.conf.5.xml:1169
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5261,7 +5477,7 @@ msgstr ""
 "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1172
+#: apt.conf.5.xml:1181
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5269,14 +5485,22 @@ msgstr ""
 "Muestra la información de los proveedores extraída de <filename>/etc/apt/"
 "vendors.list</filename>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:1191
+msgid ""
+"Display the external commands that are called by apt hooks.  This includes e."
+"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Ejemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1195
+#: apt.conf.5.xml:1216
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5286,7 +5510,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1207
+#: apt.conf.5.xml:1228
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -7296,14 +7520,14 @@ msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
-"filenames of the form <filename>package.template.XXXX</filename> and "
-"<filename>package.config.XXXX</filename>"
+"filenames of the form <filename>package.template.XXXXXX</filename> and "
+"<filename>package.config.XXXXXX</filename>"
 msgstr ""
 "El fichero de plantilla y el script de configuración se escriben en el "
 "directorio temporal definido mediante la opción <option>-t</option> o "
 "<option>--tempdir</option> (<literal>APT::ExtractTemplates::TempDir</"
 "literal>), con un formato de nombre de fichero <filename>paquete.template."
-"XXXX</filename> y <filename>paquete.config.XXXX</filename>"
+"XXXXXX</filename> y <filename>paquete.config.XXXXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:60
@@ -8339,125 +8563,6 @@ msgstr ""
 "<command>apt-ftparchive</command> devuelve cero si no hay ningún error, y el "
 "valor 100 en caso de error."
 
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "apt"
-msgstr "apt"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "16 June 1998"
-msgstr "16 de Junio de 1998"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "Debian"
-msgstr "Debian"
-
-#. type: SH
-#: apt.8:18
-#, no-wrap
-msgid "NAME"
-msgstr "NOMBRE"
-
-#. type: Plain text
-#: apt.8:20
-msgid "apt - Advanced Package Tool"
-msgstr "apt - Herramienta avanzada de paquetes"
-
-#. type: SH
-#: apt.8:20
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr "SINOPSIS"
-
-#. type: Plain text
-#: apt.8:22
-msgid "B<apt>"
-msgstr "B<apt>"
-
-#. type: SH
-#: apt.8:22
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr "DESCRIPCIÓN"
-
-#. type: Plain text
-#: apt.8:31
-msgid ""
-"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-"System. Some options are only implemented in B<apt-get>(8)  though."
-msgstr ""
-"APT es un sistema de gestión de paquetes de software. Dispone de varias "
-"interfaces para la gestión de paquetes normal del día a día, tales como "
-"B<aptitude>(8) para la línea de órdenes o B<synaptic>(8) para el sistema de "
-"ventanas de X. Algunas opciones sólo están implementadas en B<apt-get>(8)."
-
-#. type: SH
-#: apt.8:31
-#, no-wrap
-msgid "SEE ALSO"
-msgstr "VÉASE TAMBIÉN"
-
-#. type: Plain text
-#: apt.8:38
-msgid ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-msgstr ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-
-#. type: SH
-#: apt.8:38
-#, no-wrap
-msgid "DIAGNOSTICS"
-msgstr "DIAGNÓSTICOS"
-
-#. type: Plain text
-#: apt.8:40
-msgid "apt returns zero on normal operation, decimal 100 on error."
-msgstr ""
-"apt devuelve cero si no hay ningún error, y el valor 100 en caso de error."
-
-#. type: SH
-#: apt.8:40
-#, no-wrap
-msgid "BUGS"
-msgstr "FALLOS"
-
-#. type: Plain text
-#: apt.8:42
-msgid "This manpage isn't even started."
-msgstr "Esta página de manual ni siquiera está iniciada."
-
-#. type: Plain text
-#: apt.8:51
-msgid ""
-"See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-"B<reportbug>(1)  command."
-msgstr ""
-"Consulte E<lt>http://bugs.debian.org/aptE<gt>. Si desea enviar un informe de "
-"error sobre B<apt>, por favor lea I</usr/share/doc/debian/bug-reporting.txt> "
-"o use la orden B<reportbug>(1)."
-
-#. type: SH
-#: apt.8:51
-#, no-wrap
-msgid "AUTHOR"
-msgstr "AUTOR"
-
-#. type: Plain text
-#: apt.8:52
-msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-msgstr "El equipo APT E<lt>apt@packages.debian.orgE<gt> escribió apt."
-
 #. type: <title></title>
 #: guide.sgml:4
 msgid "APT User's Guide"
@@ -10009,3 +10114,87 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 #: offline.sgml:234
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
+
+#~ msgid "apt"
+#~ msgstr "apt"
+
+#~ msgid "16 June 1998"
+#~ msgstr "16 de Junio de 1998"
+
+#~ msgid "Debian"
+#~ msgstr "Debian"
+
+#~ msgid "NAME"
+#~ msgstr "NOMBRE"
+
+#~ msgid "apt - Advanced Package Tool"
+#~ msgstr "apt - Herramienta avanzada de paquetes"
+
+#~ msgid "SYNOPSIS"
+#~ msgstr "SINOPSIS"
+
+#~ msgid "B<apt>"
+#~ msgstr "B<apt>"
+
+#~ msgid "DESCRIPTION"
+#~ msgstr "DESCRIPCIÓN"
+
+#, fuzzy
+#~| msgid ""
+#~| "APT is a management system for software packages. For normal day to day "
+#~| "package management there are several frontends available, such as "
+#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+#~| "System. Some options are only implemented in B<apt-get>(8)  though."
+#~ msgid ""
+#~ "For normal day to day package management there are several frontends "
+#~ "available, such as B<aptitude>(8)  for the command line or "
+#~ "B<synaptic>(8)  for the X Window System. Some options are only "
+#~ "implemented in B<apt-get>(8)  though."
+#~ msgstr ""
+#~ "APT es un sistema de gestión de paquetes de software. Dispone de varias "
+#~ "interfaces para la gestión de paquetes normal del día a día, tales como "
+#~ "B<aptitude>(8) para la línea de órdenes o B<synaptic>(8) para el sistema "
+#~ "de ventanas de X. Algunas opciones sólo están implementadas en B<apt-"
+#~ "get>(8)."
+
+#~ msgid "SEE ALSO"
+#~ msgstr "VÉASE TAMBIÉN"
+
+#, fuzzy
+#~| msgid ""
+#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~| "B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgid ""
+#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
+#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgstr ""
+#~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~ "B<apt_preferences>(5), B<apt-secure>(8)"
+
+#~ msgid "DIAGNOSTICS"
+#~ msgstr "DIAGNÓSTICOS"
+
+#~ msgid "apt returns zero on normal operation, decimal 100 on error."
+#~ msgstr ""
+#~ "apt devuelve cero si no hay ningún error, y el valor 100 en caso de error."
+
+#~ msgid "BUGS"
+#~ msgstr "FALLOS"
+
+#~ msgid "This manpage isn't even started."
+#~ msgstr "Esta página de manual ni siquiera está iniciada."
+
+#~ msgid ""
+#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
+#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "B<reportbug>(1)  command."
+#~ msgstr ""
+#~ "Consulte E<lt>http://bugs.debian.org/aptE<gt>. Si desea enviar un informe "
+#~ "de error sobre B<apt>, por favor lea I</usr/share/doc/debian/bug-"
+#~ "reporting.txt> o use la orden B<reportbug>(1)."
+
+#~ msgid "AUTHOR"
+#~ msgstr "AUTOR"
+
+#~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
+#~ msgstr "El equipo APT E<lt>apt@packages.debian.orgE<gt> escribió apt."
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 2ae614b56..530de5046 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
-"PO-Revision-Date: 2013-04-09 07:56+0200\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -610,34 +610,266 @@ msgid ""
 msgstr "<!ENTITY synopsis-keyid \"id_de_clé\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27 apt-mark.8.xml:28
-#: apt-secure.8.xml:27 apt-cdrom.8.xml:27 apt-config.8.xml:28
+#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
+#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
+#: apt-config.8.xml:28
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28 apt-mark.8.xml:29
-#: apt-secure.8.xml:28 apt-cdrom.8.xml:28 apt-config.8.xml:29
-#: apt.conf.5.xml:34 apt_preferences.5.xml:28 sources.list.5.xml:29
-#: apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29 apt-ftparchive.1.xml:29
+#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
+#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
+#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
+#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
+#: apt-ftparchive.1.xml:29
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
-msgid "APT package handling utility -- command-line interface"
+#: apt.8.xml:32
+msgid "command-line interface"
 msgstr ""
-"Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 apt-mark.8.xml:40
-#: apt-secure.8.xml:52 apt-cdrom.8.xml:39 apt-config.8.xml:40
-#: apt.conf.5.xml:43 apt_preferences.5.xml:38 sources.list.5.xml:38
-#: apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40 apt-ftparchive.1.xml:40
+#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
+#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
+#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
+#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
+#: apt-ftparchive.1.xml:40
 msgid "Description"
 msgstr "Description"
 
 #. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:38
+msgid ""
+"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
+"handling packages. It provides a commandline interface for the package "
+"management of the system.  See also &apt-get; and &apt-cache; for more low-"
+"level command options."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:47
+msgid ""
+"<literal>list</literal> is used to display a list of packages. It supports "
+"shell pattern for matching package names and the following options: "
+"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"versions</option> are supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:58
+msgid ""
+"<literal>search</literal> searches for the given term(s) and display "
+"matching packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:64
+#, fuzzy
+#| msgid ""
+#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
+#| "package has."
+msgid ""
+"<literal>show</literal> shows the package information for the given "
+"package(s)."
+msgstr ""
+"La commande <literal>rdepends</literal> affiche la liste de toutes les "
+"dépendances inverses d'un paquet."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:71
+msgid ""
+"<literal>install</literal> is followed by one or more package names desired "
+"for installation or upgrading."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:75 apt-get.8.xml:118
+msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"On peut choisir d'installer une version particulière d'un paquet en faisant "
+"suivre son nom par un signe égal et par la version. Cette version sera "
+"recherchée et l'installation sera demandée. On peut aussi choisir une "
+"distribution particulière en faisant suivre le nom du paquet par une barre "
+"oblique et par le nom de la distribution ou de l'archive (stable, testing, "
+"unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:85 apt-get.8.xml:153
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"La commande <literal>remove</literal> est identique à la commande "
+"<literal>install</literal>, les paquets étant alors supprimés et non "
+"installés. Veuillez noter que la suppression d'un paquet en laisse les "
+"fichiers de configuration sur le système. Quand un signe plus est accolé "
+"(sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu "
+"d'être supprimé."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:93
+msgid ""
+"<literal>edit-sources</literal> lets you edit your sources.list file and "
+"provides basic sanity checks."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:99
+#, fuzzy
+#| msgid ""
+#| "<literal>showhold</literal> is used to print a list of packages on hold "
+#| "in the same way as for the other show commands."
+msgid ""
+"<literal>update</literal> is used to resynchronize the package index files "
+"from their sources."
+msgstr ""
+"<literal>showhold</literal> permet d'afficher la liste des paquets conservés "
+"de manière analogue aux commandes de même type."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:105
+msgid ""
+"<literal>upgrade</literal> is used to install the newest versions of all "
+"packages currently installed on the system from the sources enumerated in "
+"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
+"but existing package will never removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:114
+msgid ""
+"<literal>full-upgrade</literal> performs the function of upgrade but may "
+"also remove installed packages if that is required in order to resolve a "
+"package conflict."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
+#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
+#: apt-ftparchive.1.xml:506
+msgid "options"
+msgstr "options"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:134
+msgid "Script usage"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:136
+msgid ""
+"The &apt; commandline is designed as a end-user tool and it may change the "
+"output between versions. While it tries to not break backward compatibility "
+"there is no guarantee for it either.  All features of &apt; are available in "
+"&apt-cache; and &apt-get; via APT options. Please prefer using these "
+"commands in your scripts."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:144
+msgid "Differences to &apt-get;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:145
+msgid ""
+"The <command>apt</command> command is meant to be pleasant for end users and "
+"does not need to be backward compatible like &apt-get;. Therefore some "
+"options are different:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:151
+#, fuzzy
+#| msgid "the <literal>Package:</literal> line"
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgstr "la ligne <literal>Package:</literal>"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:155
+#, fuzzy
+#| msgid "the <literal>Component:</literal> line"
+msgid "The option <literal>APT::Color</literal> is enabled."
+msgstr "La ligne <literal>Component:</literal>"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:159
+msgid ""
+"A new <literal>list</literal> command is available similar to <literal>dpkg "
+"--list</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:164
+#, fuzzy
+#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+msgid ""
+"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
+"enabled by default."
+msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
+#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
+#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
+#: apt-ftparchive.1.xml:609
+msgid "See Also"
+msgstr "Voir aussi"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:175
+#, fuzzy
+#| msgid ""
+#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
+#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
+#| "preferences;, the APT Howto."
+msgid ""
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
+"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
+msgstr ""
+"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
+"&apt-config;, le guide d'APT dans &guidesdir;, &apt-preferences;, le "
+"« HOWTO » d'APT."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
+#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
+#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+msgid "Diagnostics"
+msgstr "Diagnostics"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:181
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
+#| "on error."
+msgid ""
+"<command>apt</command> returns zero on normal operation, decimal 100 on "
+"error."
+msgstr ""
+"<command>apt-get</command> renvoie zéro après une opération normale, le "
+"décimal 100 en cas d'erreur."
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-get.8.xml:35
+msgid "APT package handling utility -- command-line interface"
+msgstr ""
+"Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:41
 #, fuzzy
 #| msgid ""
@@ -789,23 +1021,6 @@ msgstr ""
 "prises par le système de résolution des conflits d'apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:118
-msgid ""
-"A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
-msgstr ""
-"On peut choisir d'installer une version particulière d'un paquet en faisant "
-"suivre son nom par un signe égal et par la version. Cette version sera "
-"recherchée et l'installation sera demandée. On peut aussi choisir une "
-"distribution particulière en faisant suivre le nom du paquet par une barre "
-"oblique et par le nom de la distribution ou de l'archive (stable, testing, "
-"unstable)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:125
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
@@ -866,22 +1081,6 @@ msgstr ""
 "d'utiliser une expression plus précise."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:153
-msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"La commande <literal>remove</literal> est identique à la commande "
-"<literal>install</literal>, les paquets étant alors supprimés et non "
-"installés. Veuillez noter que la suppression d'un paquet en laisse les "
-"fichiers de configuration sur le système. Quand un signe plus est accolé "
-"(sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu "
-"d'être supprimé."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:161
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
@@ -1081,13 +1280,6 @@ msgstr ""
 "il est possible d'utiliser les mêmes options que pour la commande "
 "<option>install</option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
-msgid "options"
-msgstr "options"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:262
 msgid ""
@@ -1304,13 +1496,21 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:370
+#, fuzzy
+#| msgid ""
+#| "This option controls the architecture packages are built for by "
+#| "<command>apt-get source --compile</command> and how cross-"
+#| "builddependencies are satisfied. By default is it not set which means "
+#| "that the host architecture is the same as the build architecture (which "
+#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
+#| "<literal>APT::Get::Host-Architecture</literal>"
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
 "is the same as the build architecture (which is defined by <literal>APT::"
 "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>"
+"Architecture</literal>."
 msgstr ""
 "Cette option contrôle comment les paquets d'architectures sont construits "
 "par <command>apt-get source --compile</command> et comment les dépendances "
@@ -1322,6 +1522,31 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:380
+#, fuzzy
+#| msgid ""
+#| "This option controls the architecture packages are built for by "
+#| "<command>apt-get source --compile</command> and how cross-"
+#| "builddependencies are satisfied. By default is it not set which means "
+#| "that the host architecture is the same as the build architecture (which "
+#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
+#| "<literal>APT::Get::Host-Architecture</literal>"
+msgid ""
+"This option controls the activated build profiles for which a source package "
+"is built by <command>apt-get source --compile</command> and how build "
+"dependencies are satisfied. By default no build profile is active.  More "
+"than one build profile can be activated at a time by concatenating them with "
+"a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
+msgstr ""
+"Cette option contrôle comment les paquets d'architectures sont construits "
+"par <command>apt-get source --compile</command> et comment les dépendances "
+"de construction transverses sont respectées. Elle n'est pas positionnée par "
+"défaut ce qui signifie que l'architecture hôte est la même que "
+"l'architecture de construction (définie par <literal>APT::Architecture</"
+"literal>).  Élément de configuration : <literal>APT::Get::Host-Architecture</"
+"literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:391
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1330,7 +1555,7 @@ msgstr ""
 "configuration : <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:396
 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -1344,7 +1569,7 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:403
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1356,7 +1581,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:404
+#: apt-get.8.xml:415
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1369,7 +1594,7 @@ msgstr ""
 "Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:411
+#: apt-get.8.xml:422
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1382,7 +1607,7 @@ msgstr ""
 "configuration : <literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:430
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -1398,7 +1623,7 @@ msgstr ""
 "yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:438
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "
@@ -1420,7 +1645,7 @@ msgstr ""
 "<literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:449
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1434,7 +1659,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:446
+#: apt-get.8.xml:457
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1443,7 +1668,7 @@ msgstr ""
 "Élément de configuration : <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:462
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1461,7 +1686,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:461
+#: apt-get.8.xml:472
 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -1483,7 +1708,7 @@ msgstr ""
 "Release</literal>.  Voyez aussi la page de manuel d'&apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:476
+#: apt-get.8.xml:487
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1497,7 +1722,7 @@ msgstr ""
 "Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:494
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1507,7 +1732,7 @@ msgstr ""
 "Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:500
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1520,7 +1745,7 @@ msgstr ""
 "inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:507
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1540,7 +1765,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:518
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1552,7 +1777,7 @@ msgstr ""
 "literal>, "
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:524
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1562,7 +1787,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:529
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1574,32 +1799,23 @@ msgstr ""
 "AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:535
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1200 apt_preferences.5.xml:700
+#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
+#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "Fichiers"
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
-#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
-#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
-msgid "See Also"
-msgstr "Voir aussi"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:559
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1614,15 +1830,8 @@ msgstr ""
 "&apt-config;, le guide d'APT dans &guidesdir;, &apt-preferences;, le "
 "« HOWTO » d'APT."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
-msgid "Diagnostics"
-msgstr "Diagnostics"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:565
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -3481,7 +3690,16 @@ msgstr ""
 "sont enregistrées avec <command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:182
+msgid ""
+"List of all build profiles enabled for build-dependency resolution, without "
+"the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
+"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
+"buildpackage; overrides the list notation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:190
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3495,7 +3713,7 @@ msgstr ""
 "&apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:187
+#: apt.conf.5.xml:196
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3505,7 +3723,7 @@ msgstr ""
 "décision."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:201
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3519,7 +3737,7 @@ msgstr ""
 "direct pour les réinstaller."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:209
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3546,7 +3764,7 @@ msgstr ""
 "dépendances ne sont pas satisfaites."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:221
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3575,7 +3793,7 @@ msgstr ""
 "le seul qu'elle permet d'éviter."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:234
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3593,7 +3811,7 @@ msgstr ""
 "corriger les processus de mise à jour."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:245
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3615,7 +3833,7 @@ msgstr ""
 "tous les paquets dont ces paquets dépendent."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:248
+#: apt.conf.5.xml:257
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3655,14 +3873,14 @@ msgstr ""
 "l'augmentation automatique de la taille du cache est désactivée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:273
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Cette option définit les paquets qui sont considérés comme faisant partie "
 "des dépendances essentielles pour la construction de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:268
+#: apt.conf.5.xml:277
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3672,7 +3890,7 @@ msgstr ""
 "question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:282
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3682,7 +3900,7 @@ msgstr ""
 "options en question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:278
+#: apt.conf.5.xml:287
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3692,12 +3910,12 @@ msgstr ""
 "options en question."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:293
 msgid "The Acquire Group"
 msgstr "Le groupe Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:294
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3708,7 +3926,7 @@ msgstr ""
 "effectuent ce téléchargement (voir aussi &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#: apt.conf.5.xml:301
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3729,7 +3947,7 @@ msgstr ""
 "alors utilisée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:314
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3748,7 +3966,7 @@ msgstr ""
 "l'option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:317
+#: apt.conf.5.xml:326
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3768,7 +3986,7 @@ msgstr ""
 "nom de l'option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:338
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3779,7 +3997,7 @@ msgstr ""
 "filename>), plutôt que de les télécharger entièrement. Par défaut à « true »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:341
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3798,7 +4016,7 @@ msgstr ""
 "fichiers de différences."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:342
+#: apt.conf.5.xml:351
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3814,7 +4032,7 @@ msgstr ""
 "initiée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:350
+#: apt.conf.5.xml:359
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3824,7 +4042,7 @@ msgstr ""
 "échoué."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:364
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3834,7 +4052,7 @@ msgstr ""
 "archives de sources au lieu de les copier.  Par défaut à « true »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:369
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3855,7 +4073,7 @@ msgstr ""
 "options de mandataire HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:377
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3875,7 +4093,7 @@ msgstr ""
 "fichiers .deb très grands."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:378 apt.conf.5.xml:466
+#: apt.conf.5.xml:387 apt.conf.5.xml:475
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3885,7 +4103,7 @@ msgstr ""
 "connexion qu'aux données."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:390
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3905,7 +4123,7 @@ msgstr ""
 "qui ne respectent pas la norme HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:388
+#: apt.conf.5.xml:397
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3914,7 +4132,7 @@ msgstr ""
 "suive les redirections. Ce réglage est activé par défaut."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:400
 #, fuzzy
 #| msgid ""
 #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
@@ -3936,7 +4154,7 @@ msgstr ""
 "implicitement le téléchargement simultané depuis plusieurs serveurs."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:398
+#: apt.conf.5.xml:407
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3948,7 +4166,7 @@ msgstr ""
 "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -3962,7 +4180,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:429
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3979,7 +4197,7 @@ msgstr ""
 "literal> n'est pas encore gérée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:437
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4012,7 +4230,7 @@ msgstr ""
 "<literal>TLSv1</literal> ou <literal>SSLv3</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:458
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4048,7 +4266,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:478
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -4065,7 +4283,7 @@ msgstr ""
 "modèle de fichier de configuration)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:485
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4080,7 +4298,7 @@ msgstr ""
 "efficacité de cette méthode."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:490
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4096,13 +4314,13 @@ msgstr ""
 "des serveurs FTP ne suivent pas la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:499
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4125,7 +4343,7 @@ msgstr ""
 "<literal>UMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:512
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4134,13 +4352,13 @@ msgstr ""
 "permet de passer des paramètres à gpgv"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:523
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:518
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4160,19 +4378,19 @@ msgstr ""
 "type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:528
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:531
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:524
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4204,13 +4422,13 @@ msgstr ""
 "<literal>bz2</literal> à liste car il sera ajouté automatiquement."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:538
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:533
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4237,7 +4455,7 @@ msgstr ""
 "question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:543
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4249,7 +4467,7 @@ msgstr ""
 "surtout destiné aux miroirs locaux."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:541
+#: apt.conf.5.xml:550
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4264,7 +4482,7 @@ msgstr ""
 "(« False »)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:558
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4284,13 +4502,13 @@ msgstr ""
 "langues étant particulièrement rares."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:575
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:563
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4330,7 +4548,7 @@ msgstr ""
 "alors « de, fr, en ». <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:576
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4344,22 +4562,22 @@ msgstr ""
 "(après un « <literal>none</literal> » implicite)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr "Utilisation imposée du protocole IPv4 lors des téléchargements."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:582
+#: apt.conf.5.xml:591
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr "Utilisation imposée du protocole IPv6 lors des téléchargements."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:598
 msgid "Directories"
 msgstr "Les répertoires"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:600
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4379,7 +4597,7 @@ msgstr ""
 "<filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:607
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4402,7 +4620,7 @@ msgstr ""
 "Cache</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:616
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4417,7 +4635,7 @@ msgstr ""
 "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:622
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4428,7 +4646,7 @@ msgstr ""
 "configuration est chargé."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:626
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4446,7 +4664,7 @@ msgstr ""
 "programmes correspondants."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:634
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4468,7 +4686,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:647
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4486,12 +4704,12 @@ msgstr ""
 "est possible d'utiliser la syntaxe des expressions rationnelles."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:656
 msgid "APT in DSelect"
 msgstr "APT et DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:658
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4502,7 +4720,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:663
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4525,7 +4743,7 @@ msgstr ""
 "avant de récupérer de nouveaux paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4534,7 +4752,7 @@ msgstr ""
 "&apt-get; lors de la phase d'installation."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:682
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4543,7 +4761,7 @@ msgstr ""
 "&apt-get; lors de la phase de mise à jour."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:678
+#: apt.conf.5.xml:687
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4553,12 +4771,12 @@ msgstr ""
 "d'erreur que l'on propose à l'utilisateur d'intervenir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:693
 msgid "How APT calls &dpkg;"
 msgstr "Méthode d'appel de &dpkg; par APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:694
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4567,7 +4785,7 @@ msgstr ""
 "&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:699
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4578,7 +4796,7 @@ msgstr ""
 "est passé comme un seul paramètre à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:696
+#: apt.conf.5.xml:705
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4591,7 +4809,7 @@ msgstr ""
 "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:712
 #, fuzzy
 #| msgid ""
 #| "This is a list of shell commands to run before invoking &dpkg;. Like "
@@ -4615,7 +4833,7 @@ msgstr ""
 "qu'il va installer, à raison d'un par ligne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:719
 #, fuzzy
 #| msgid ""
 #| "Version 2 of this protocol dumps more information, including the protocol "
@@ -4637,7 +4855,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:724
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4648,7 +4866,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:731
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4659,7 +4877,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:741
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4668,7 +4886,7 @@ msgstr ""
 "le répertoire <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:746
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4678,14 +4896,14 @@ msgstr ""
 "créés."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:751
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 "utilisation des actions différées (« triggers ») de dpkg (et options "
 "associées)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:752
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4712,7 +4930,7 @@ msgstr ""
 "pendant la configuration des paquets."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:767
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4726,7 +4944,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:761
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4750,7 +4968,7 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:774
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4773,7 +4991,7 @@ msgstr ""
 "options « unpack » et « remove »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:782
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4803,7 +5021,7 @@ msgstr ""
 "configuré et donc éventuellement non amorçable."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:797
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4822,7 +5040,7 @@ msgstr ""
 "peut conserver l'option active."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:804
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4840,7 +5058,7 @@ msgstr ""
 "celles concernant le paquet en cours de traitement."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:817
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4858,7 +5076,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:810
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4884,12 +5102,12 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:830
 msgid "Periodic and Archives options"
 msgstr "Options « Periodic » et « Archive »"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:831
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4901,12 +5119,12 @@ msgstr ""
 "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:839
 msgid "Debug options"
 msgstr "Les options de débogage"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:841
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4924,7 +5142,7 @@ msgstr ""
 "peuvent tout de même être utiles :"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:852
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4935,7 +5153,7 @@ msgstr ""
 "upgrade, upgrade, install, remove et purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:860
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4947,7 +5165,7 @@ msgstr ""
 "superutilisateur."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:869
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4959,7 +5177,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:877
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4968,12 +5186,12 @@ msgstr ""
 "type statfs dans les identifiants de CD."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:887
 msgid "A full list of debugging options to apt follows."
 msgstr "Liste complète des options de débogage de APT :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:896
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -4981,24 +5199,24 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:907
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:918
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:929
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "Print information related to downloading packages using HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:940
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5007,7 +5225,7 @@ msgstr ""
 "cryptographiques avec <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:951
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5016,14 +5234,14 @@ msgstr ""
 "stockées sur CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:961
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Décrit le processus de résolution des dépendances pour la construction de "
 "paquets source ( « build-dependencies » ) par &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:971
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5032,7 +5250,7 @@ msgstr ""
 "librairies d'<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:981
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5043,7 +5261,7 @@ msgstr ""
 "utilisés sur le système de fichier du CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:992
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5053,14 +5271,14 @@ msgstr ""
 "temps."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1004
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Trace les ajouts et suppressions d'éléments de la queue globale de "
 "téléchargement."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1014
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5070,7 +5288,7 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1024
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5080,7 +5298,7 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1036
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5090,7 +5308,7 @@ msgstr ""
 "place des fichiers complets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1047
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5098,7 +5316,7 @@ msgstr ""
 "effectivement des téléchargements."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1049
+#: apt.conf.5.xml:1058
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5107,7 +5325,7 @@ msgstr ""
 "automatiquement, et la suppression des paquets inutiles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1059
+#: apt.conf.5.xml:1068
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5122,7 +5340,7 @@ msgstr ""
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1082
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5158,7 +5376,7 @@ msgstr ""
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1094
+#: apt.conf.5.xml:1103
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5167,7 +5385,7 @@ msgstr ""
 "paramètres sont séparés par des espaces."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1114
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5177,7 +5395,7 @@ msgstr ""
 "fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1125
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5186,18 +5404,18 @@ msgstr ""
 "<literal>apt</literal> passe les paquets à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1137
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1139
+#: apt.conf.5.xml:1148
 msgid "Output the priority of each package list on startup."
 msgstr "Affiche, au lancement, la priorité de chaque liste de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1149
+#: apt.conf.5.xml:1158
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5206,7 +5424,7 @@ msgstr ""
 "concerne que les cas où un problème de dépendances complexe se présente)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1160
+#: apt.conf.5.xml:1169
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5217,7 +5435,7 @@ msgstr ""
 "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1172
+#: apt.conf.5.xml:1181
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5225,14 +5443,22 @@ msgstr ""
 "Affiche les fournisseurs déclarés dans le fichier <filename>/etc/apt/vendors."
 "list</filename>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:1191
+msgid ""
+"Display the external commands that are called by apt hooks.  This includes e."
+"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Exemples"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1195
+#: apt.conf.5.xml:1216
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5242,7 +5468,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1207
+#: apt.conf.5.xml:1228
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -7244,14 +7470,14 @@ msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
-"filenames of the form <filename>package.template.XXXX</filename> and "
-"<filename>package.config.XXXX</filename>"
+"filenames of the form <filename>package.template.XXXXXX</filename> and "
+"<filename>package.config.XXXXXX</filename>"
 msgstr ""
 "Les scripts et guides de configuration sont écrits dans le répertoire "
 "temporaire indiqué par l'option <option>-t</option> ou <option>--tempdir</"
 "option> (<literal>APT::ExtractTemplates::TempDir</literal>) ; les noms de "
-"fichier sont de la forme <filename>package.template.XXXX</filename> ou "
-"<filename>package.config.XXXX</filename>."
+"fichier sont de la forme <filename>package.template.XXXXXX</filename> ou "
+"<filename>package.config.XXXXXX</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:60
@@ -8280,128 +8506,6 @@ msgstr ""
 "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
 "nombre 100 en cas d'erreur."
 
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "apt"
-msgstr "apt"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "16 June 1998"
-msgstr "16 Juin 1998"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "Debian"
-msgstr "Debian"
-
-#. type: SH
-#: apt.8:18
-#, no-wrap
-msgid "NAME"
-msgstr "NOM"
-
-#. type: Plain text
-#: apt.8:20
-msgid "apt - Advanced Package Tool"
-msgstr "apt - Outil complet de gestion de paquets"
-
-#. type: SH
-#: apt.8:20
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr "RÉSUMÉ"
-
-#. type: Plain text
-#: apt.8:22
-msgid "B<apt>"
-msgstr "B<apt>"
-
-#. type: SH
-#: apt.8:22
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr "DESCRIPTION"
-
-#. type: Plain text
-#: apt.8:31
-msgid ""
-"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-"System. Some options are only implemented in B<apt-get>(8)  though."
-msgstr ""
-"APT est un système de gestion de paquets logiciels. Pour la gestion au "
-"quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) en "
-"ligne de commande ou B<synaptic>(8) pour X Window. Cependant, certaines "
-"options ne sont disponibles que dans B<apt-get>(8)."
-
-#. type: SH
-#: apt.8:31
-#, no-wrap
-msgid "SEE ALSO"
-msgstr "VOIR AUSSI"
-
-#. type: Plain text
-#: apt.8:38
-msgid ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-msgstr ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-
-#. type: SH
-#: apt.8:38
-#, no-wrap
-msgid "DIAGNOSTICS"
-msgstr "DIAGNOSTICS"
-
-#. type: Plain text
-#: apt.8:40
-msgid "apt returns zero on normal operation, decimal 100 on error."
-msgstr ""
-"apt renvoie zéro après une opération normale et la valeur décimale 100 en "
-"cas d'erreur."
-
-#. type: SH
-#: apt.8:40
-#, no-wrap
-msgid "BUGS"
-msgstr "BOGUES"
-
-#. type: Plain text
-#: apt.8:42
-msgid "This manpage isn't even started."
-msgstr "Cette page de manuel n'a même pas commencé à être rédigée."
-
-#. type: Plain text
-#: apt.8:51
-msgid ""
-"See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-"B<reportbug>(1)  command."
-msgstr ""
-"Voir E<lt>http://bugs.debian.org/aptE<gt>. Si vous souhaitez signaler un "
-"bogue dans B<apt>, veuillez lire I</usr/share/doc/debian/bug-reporting.txt> "
-"ou utiliser la commande B<reportbug>(1)."
-
-#. type: SH
-#: apt.8:51
-#, no-wrap
-msgid "AUTHOR"
-msgstr "AUTEURS"
-
-#. type: Plain text
-#: apt.8:52
-msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-msgstr ""
-"apt a été écrit par l'équipe de développement APT E<lt>apt@packages.debian."
-"orgE<gt>."
-
 #. type: <title></title>
 #: guide.sgml:4
 msgid "APT User's Guide"
@@ -9993,6 +10097,92 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
+#~ msgid "apt"
+#~ msgstr "apt"
+
+#~ msgid "16 June 1998"
+#~ msgstr "16 Juin 1998"
+
+#~ msgid "Debian"
+#~ msgstr "Debian"
+
+#~ msgid "NAME"
+#~ msgstr "NOM"
+
+#~ msgid "apt - Advanced Package Tool"
+#~ msgstr "apt - Outil complet de gestion de paquets"
+
+#~ msgid "SYNOPSIS"
+#~ msgstr "RÉSUMÉ"
+
+#~ msgid "B<apt>"
+#~ msgstr "B<apt>"
+
+#~ msgid "DESCRIPTION"
+#~ msgstr "DESCRIPTION"
+
+#, fuzzy
+#~| msgid ""
+#~| "APT is a management system for software packages. For normal day to day "
+#~| "package management there are several frontends available, such as "
+#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+#~| "System. Some options are only implemented in B<apt-get>(8)  though."
+#~ msgid ""
+#~ "For normal day to day package management there are several frontends "
+#~ "available, such as B<aptitude>(8)  for the command line or "
+#~ "B<synaptic>(8)  for the X Window System. Some options are only "
+#~ "implemented in B<apt-get>(8)  though."
+#~ msgstr ""
+#~ "APT est un système de gestion de paquets logiciels. Pour la gestion au "
+#~ "quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) "
+#~ "en ligne de commande ou B<synaptic>(8) pour X Window. Cependant, "
+#~ "certaines options ne sont disponibles que dans B<apt-get>(8)."
+
+#~ msgid "SEE ALSO"
+#~ msgstr "VOIR AUSSI"
+
+#, fuzzy
+#~| msgid ""
+#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~| "B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgid ""
+#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
+#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgstr ""
+#~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~ "B<apt_preferences>(5), B<apt-secure>(8)"
+
+#~ msgid "DIAGNOSTICS"
+#~ msgstr "DIAGNOSTICS"
+
+#~ msgid "apt returns zero on normal operation, decimal 100 on error."
+#~ msgstr ""
+#~ "apt renvoie zéro après une opération normale et la valeur décimale 100 en "
+#~ "cas d'erreur."
+
+#~ msgid "BUGS"
+#~ msgstr "BOGUES"
+
+#~ msgid "This manpage isn't even started."
+#~ msgstr "Cette page de manuel n'a même pas commencé à être rédigée."
+
+#~ msgid ""
+#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
+#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "B<reportbug>(1)  command."
+#~ msgstr ""
+#~ "Voir E<lt>http://bugs.debian.org/aptE<gt>. Si vous souhaitez signaler un "
+#~ "bogue dans B<apt>, veuillez lire I</usr/share/doc/debian/bug-reporting."
+#~ "txt> ou utiliser la commande B<reportbug>(1)."
+
+#~ msgid "AUTHOR"
+#~ msgstr "AUTEURS"
+
+#~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
+#~ msgstr ""
+#~ "apt a été écrit par l'équipe de développement APT E<lt>apt@packages."
+#~ "debian.orgE<gt>."
+
 #~ msgid "Package resource list for APT"
 #~ msgstr "Liste des sources de paquets"
 
diff --git a/doc/po/it.po b/doc/po/it.po
index 1050cee57..c5ef090ff 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -5,14 +5,13 @@
 # Eugenia Franzoni, 2000
 # Hugh Hartmann, 2000-2012
 # Gabriele Stilli, 2012
-# Beatrice Torracca, 2012
-# Beatrice Torracca <beatricet@libero.it>, 2012.
+# Beatrice Torracca <beatricet@libero.it>, 2012, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
-"PO-Revision-Date: 2012-12-23 18:04+0200\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "Language: it\n"
@@ -663,41 +662,267 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"IDchiave\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27 apt-mark.8.xml:28
-#: apt-secure.8.xml:27 apt-cdrom.8.xml:27 apt-config.8.xml:28
+#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
+#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
+#: apt-config.8.xml:28
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28 apt-mark.8.xml:29
-#: apt-secure.8.xml:28 apt-cdrom.8.xml:28 apt-config.8.xml:29
-#: apt.conf.5.xml:34 apt_preferences.5.xml:28 sources.list.5.xml:29
-#: apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29 apt-ftparchive.1.xml:29
+#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
+#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
+#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
+#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
+#: apt-ftparchive.1.xml:29
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
-msgid "APT package handling utility -- command-line interface"
+#: apt.8.xml:32
+msgid "command-line interface"
 msgstr ""
-"strumento APT per la gestione dei pacchetti, interfaccia a riga di comando"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 apt-mark.8.xml:40
-#: apt-secure.8.xml:52 apt-cdrom.8.xml:39 apt-config.8.xml:40
-#: apt.conf.5.xml:43 apt_preferences.5.xml:38 sources.list.5.xml:38
-#: apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40 apt-ftparchive.1.xml:40
+#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
+#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
+#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
+#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
+#: apt-ftparchive.1.xml:40
 msgid "Description"
 msgstr "Descrizione"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
+#: apt.8.xml:38
+msgid ""
+"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
+"handling packages. It provides a commandline interface for the package "
+"management of the system.  See also &apt-get; and &apt-cache; for more low-"
+"level command options."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:47
+msgid ""
+"<literal>list</literal> is used to display a list of packages. It supports "
+"shell pattern for matching package names and the following options: "
+"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"versions</option> are supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:58
+msgid ""
+"<literal>search</literal> searches for the given term(s) and display "
+"matching packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:64
+#, fuzzy
+#| msgid ""
+#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
+#| "package has."
+msgid ""
+"<literal>show</literal> shows the package information for the given "
+"package(s)."
+msgstr ""
+"<literal>rdepends</literal> mostra un elenco di tutte le dipendenze inverse "
+"di un pacchetto."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:71
+msgid ""
+"<literal>install</literal> is followed by one or more package names desired "
+"for installation or upgrading."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:75 apt-get.8.xml:118
+msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"È possibile selezionare una versione specifica di un pacchetto per "
+"l'installazione scrivendo dopo il nome del pacchetto un segno di uguale e la "
+"versione del pacchetto da selezionare. Ciò farà sì che venga localizzata e "
+"selezionata per l'installazione quella versione. In alternativa può essere "
+"selezionata una distribuzione specifica scrivendo dopo il nome del pacchetto "
+"una sbarra («/») e la versione della distribuzione o il nome dell'archivio "
+"(stable, testing, unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:85 apt-get.8.xml:153
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> è identico a <literal>install</literal> tranne per "
+"il fatto che i pacchetti sono rimossi invece che installati. Notare che la "
+"rimozione di un pacchetto lascia i suoi file di configurazione nel sistema. "
+"Se viene aggiunto un segno più in fondo al nome del pacchetto (senza spazi "
+"in mezzo), il pacchetto specificato viene installato invece che rimosso."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:93
+msgid ""
+"<literal>edit-sources</literal> lets you edit your sources.list file and "
+"provides basic sanity checks."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:99
 #, fuzzy
 #| msgid ""
-#| "<command>apt-get</command> is the command-line tool for handling "
-#| "packages, and may be considered the user's \"back-end\" to other tools "
-#| "using the APT library.  Several \"front-end\" interfaces exist, such as "
-#| "&dselect;, &aptitude;, &synaptic; and &wajig;."
+#| "<literal>showhold</literal> is used to print a list of packages on hold "
+#| "in the same way as for the other show commands."
+msgid ""
+"<literal>update</literal> is used to resynchronize the package index files "
+"from their sources."
+msgstr ""
+"<literal>showhold</literal> viene usato per stampare un elenco di pacchetti "
+"bloccati in modo uguale a ciò che fanno gli altri comandi «show»."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:105
+msgid ""
+"<literal>upgrade</literal> is used to install the newest versions of all "
+"packages currently installed on the system from the sources enumerated in "
+"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
+"but existing package will never removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:114
+msgid ""
+"<literal>full-upgrade</literal> performs the function of upgrade but may "
+"also remove installed packages if that is required in order to resolve a "
+"package conflict."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
+#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
+#: apt-ftparchive.1.xml:506
+msgid "options"
+msgstr "opzioni"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:134
+msgid "Script usage"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:136
+msgid ""
+"The &apt; commandline is designed as a end-user tool and it may change the "
+"output between versions. While it tries to not break backward compatibility "
+"there is no guarantee for it either.  All features of &apt; are available in "
+"&apt-cache; and &apt-get; via APT options. Please prefer using these "
+"commands in your scripts."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:144
+msgid "Differences to &apt-get;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:145
+msgid ""
+"The <command>apt</command> command is meant to be pleasant for end users and "
+"does not need to be backward compatible like &apt-get;. Therefore some "
+"options are different:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:151
+#, fuzzy
+#| msgid "the <literal>Package:</literal> line"
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgstr "la riga <literal>Package:</literal>"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:155
+#, fuzzy
+#| msgid "the <literal>Component:</literal> line"
+msgid "The option <literal>APT::Color</literal> is enabled."
+msgstr "la riga<literal>Component:</literal>"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:159
+msgid ""
+"A new <literal>list</literal> command is available similar to <literal>dpkg "
+"--list</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:164
+#, fuzzy
+#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+msgid ""
+"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
+"enabled by default."
+msgstr "la riga <literal>Archive:</literal> o <literal>Suite:</literal>"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
+#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
+#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
+#: apt-ftparchive.1.xml:609
+msgid "See Also"
+msgstr "Vedere anche"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:175
+#, fuzzy
+#| msgid ""
+#| "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-"
+#| "config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
+#| "preferences;, the APT Howto."
+msgid ""
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
+"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
+msgstr ""
+"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
+"&apt-secure;, la guida dell'utente di APT in &guidesdir;, &apt-preferences;, "
+"l'APT Howto."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
+#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
+#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+msgid "Diagnostics"
+msgstr "Diagnostica"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:181
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
+#| "on error."
+msgid ""
+"<command>apt</command> returns zero on normal operation, decimal 100 on "
+"error."
+msgstr ""
+"<command>apt-get</command> restituisce zero in caso di funzionamento normale "
+"e il valore decimale 100 in caso di errore."
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-get.8.xml:35
+msgid "APT package handling utility -- command-line interface"
+msgstr ""
+"strumento APT per la gestione dei pacchetti, interfaccia a riga di comando"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-get.8.xml:41
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -707,7 +932,7 @@ msgstr ""
 "<command>apt-get</command> è lo strumento a riga di comando per gestire "
 "pacchetti e può essere considerato il «backend» dell'utente per altri "
 "strumenti che usano la libreria APT. Esistono diversi «frontend» per "
-"interfaccia, come &dselect;, &aptitude;, &synaptic; e &wajig;."
+"interfaccia, come &aptitude;, &synaptic; e &wajig;."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
@@ -842,24 +1067,6 @@ msgstr ""
 "conflitti di apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:118
-msgid ""
-"A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
-msgstr ""
-"È possibile selezionare una versione specifica di un pacchetto per "
-"l'installazione scrivendo dopo il nome del pacchetto un segno di uguale e la "
-"versione del pacchetto da selezionare. Ciò farà sì che venga localizzata e "
-"selezionata per l'installazione quella versione. In alternativa può essere "
-"selezionata una distribuzione specifica scrivendo dopo il nome del pacchetto "
-"una sbarra («/») e la versione della distribuzione o il nome dell'archivio "
-"(stable, testing, unstable)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:125
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
@@ -918,21 +1125,6 @@ msgstr ""
 "o «$», oppure creare un'espressione regolare più specifica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:153
-msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"<literal>remove</literal> è identico a <literal>install</literal> tranne per "
-"il fatto che i pacchetti sono rimossi invece che installati. Notare che la "
-"rimozione di un pacchetto lascia i suoi file di configurazione nel sistema. "
-"Se viene aggiunto un segno più in fondo al nome del pacchetto (senza spazi "
-"in mezzo), il pacchetto specificato viene installato invece che rimosso."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:161
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
@@ -1056,15 +1248,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:217
-#, fuzzy
-#| msgid ""
-#| "<literal>clean</literal> clears out the local repository of retrieved "
-#| "package files. It removes everything but the lock file from "
-#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/"
-#| "archives/partial/</filename>. When APT is used as a &dselect; method, "
-#| "<literal>clean</literal> is run automatically.  Those who do not use "
-#| "dselect will likely want to run <literal>apt-get clean</literal> from "
-#| "time to time to free up disk space."
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -1074,10 +1257,7 @@ msgstr ""
 "<literal>clean</literal> ripulisce il repository locale dei file di "
 "pacchetto recuperati. Rimuove tutto da <filename>&cachedir;/archives/</"
 "filename> e <filename>&cachedir;/archives/partial/</filename>,  tranne il "
-"file di lock. Quando APT viene usato come metodo per &dselect;, "
-"<literal>clean</literal> viene eseguito automaticamente. Chi non usa dselect "
-"probabilmente è bene che usi <literal>apt-get clean</literal> di quando in "
-"quando per liberare spazio su disco."
+"file di lock."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:224
@@ -1132,13 +1312,6 @@ msgstr ""
 "per la versione che è installata. Tuttavia si possono specificare le stesse "
 "opzioni del comando <option>install</option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
-msgid "options"
-msgstr "opzioni"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:262
 msgid ""
@@ -1170,19 +1343,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:277
-#, fuzzy
-#| msgid ""
-#| "Fix; attempt to correct a system with broken dependencies in place. This "
-#| "option, when used with install/remove, can omit any packages to permit "
-#| "APT to deduce a likely solution. If packages are specified, these have to "
-#| "completely correct the problem. The option is sometimes necessary when "
-#| "running APT for the first time; APT itself does not allow broken package "
-#| "dependencies to exist on a system. It is possible that a system's "
-#| "dependency structure can be so corrupt as to require manual intervention "
-#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
-#| "to eliminate some of the offending packages). Use of this option together "
-#| "with <option>-m</option> may produce an error in some situations.  "
-#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -1204,10 +1364,10 @@ msgstr ""
 "volta; APT stesso non permette l'esistenza di pacchetti con dipendenze non "
 "soddisfatte in un sistema. È possibile che la struttura di dipendenze di un "
 "sistema sia corrotta a tal punto da richiedere un intervento manuale (il che "
-"di solito significa usare &dselect; o <command>dpkg --remove</command> per "
-"eliminare alcuni dei pacchetti che creano problemi). L'uso di questa opzione "
-"insieme a <option>-m</option> può in alcune situazioni produrre un errore. "
-"Voce di configurazione: <literal>APT::Get::Fix-Broken</literal>."
+"di solito significa usare <command>dpkg --remove</command> per eliminare "
+"alcuni dei pacchetti che creano problemi). L'uso di questa opzione insieme a "
+"<option>-m</option> può in alcune situazioni produrre un errore. Voce di "
+"configurazione: <literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:292
@@ -1359,7 +1519,7 @@ msgid ""
 "satisfied. By default is it not set which means that the host architecture "
 "is the same as the build architecture (which is defined by <literal>APT::"
 "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>"
+"Architecture</literal>."
 msgstr ""
 "Questa opzione controlla l'architettura per la quale <command>apt-get source "
 "--compile</command> compila i pacchetti e come le dipendenze di compilazione "
@@ -1371,6 +1531,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:380
 msgid ""
+"This option controls the activated build profiles for which a source package "
+"is built by <command>apt-get source --compile</command> and how build "
+"dependencies are satisfied. By default no build profile is active.  More "
+"than one build profile can be activated at a time by concatenating them with "
+"a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
+msgstr ""
+"Questa opzione controlla i profili di compilazione attivi per i quali "
+"<command>apt-get source --compile</command> compila un pacchetto sorgente e "
+"come le dipendenze di compilazione sono soddisfatte. In modo predefinito non "
+"è attivo alcun profilo di compilazione. Più profili di compilazione possono "
+"essere attivati contemporaneamente concatenandoli con una virgola. Voce di "
+"configurazione: <literal>APT::Build-Profiles</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:391
+msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
@@ -1378,7 +1554,7 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:396
 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -1391,7 +1567,7 @@ msgstr ""
 "non desiderati. Voce di configurazione: <literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:403
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1401,9 +1577,16 @@ msgid ""
 "will never remove packages, only allow adding new ones.  Configuration Item: "
 "<literal>APT::Get::Upgrade-Allow-New</literal>."
 msgstr ""
+"Permette l'installazione di nuovi pacchetti quando usato insieme a "
+"<literal>upgrade</literal>. Ciò è utile se l'aggiornamento di un pacchetto "
+"installato richiede l'installazione di nuove dipendenze. Invece di bloccare "
+"il pacchetto <literal>upgrade</literal> aggiornerà il pacchetto e installerà "
+"le nuove dipendenze. Notare che <literal>upgrade</literal> con questa "
+"opzione non rimuoverà mai pacchetti, permetterà solo l'aggiunta di nuovi. "
+"Voce di configurazione: <literal>APT::Get::Upgrade-Allow-New</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:404
+#: apt-get.8.xml:415
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1416,7 +1599,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:411
+#: apt-get.8.xml:422
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1430,7 +1613,7 @@ msgstr ""
 "Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:430
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -1446,7 +1629,7 @@ msgstr ""
 "yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:438
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "
@@ -1467,7 +1650,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:449
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1480,7 +1663,7 @@ msgstr ""
 "option>. Voce di configurazione: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:446
+#: apt-get.8.xml:457
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1489,7 +1672,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:462
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1506,7 +1689,7 @@ msgstr ""
 "fonti. Voce di configurazione: <literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:461
+#: apt-get.8.xml:472
 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -1530,7 +1713,7 @@ msgstr ""
 "pagina di manuale di &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:476
+#: apt-get.8.xml:487
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1544,7 +1727,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:494
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1554,7 +1737,7 @@ msgstr ""
 "Get::Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:500
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1568,7 +1751,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:507
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1587,7 +1770,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:518
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1598,7 +1781,7 @@ msgstr ""
 "Dsc-Only</literal> e <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:524
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1607,7 +1790,7 @@ msgstr ""
 "Voce di configurazione: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:529
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1618,55 +1801,47 @@ msgstr ""
 "configurazione: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:535
+#, fuzzy
+#| msgid ""
+#| "Show user friendly progress information in the terminal window when "
+#| "packages are installed, upgraded or removed. For a machine parsable "
+#| "version of this data see README.progress-reporting in the apt doc "
+#| "directory.  Configuration Item: <literal>DpkgPM::Progress</literal> and "
+#| "<literal>Dpkg::Progress-Fancy</literal>."
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
+"Mostra informazioni sul progresso facili da leggere nella finestra del "
+"terminale quando i pacchetti sono installati, aggiornati o rimossi. Per una "
+"versione analizzabile da macchina di questi dati, vedere README.progress-"
+"reporting nella directory della documentazione di apt. Voce di "
+"configurazione: <literal>DpkgPM::Progress</literal> e <literal>Dpkg::"
+"Progress-Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1200 apt_preferences.5.xml:700
+#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
+#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "File"
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
-#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
-#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
-msgid "See Also"
-msgstr "Vedere anche"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:548
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
+#: apt-get.8.xml:559
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
 "APT Howto."
 msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, la Guida dell'utente di APT in &guidesdir;, &apt-"
-"preferences;, l'APT Howto."
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
-msgid "Diagnostics"
-msgstr "Diagnostica"
+"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
+"&apt-secure;, la guida dell'utente di APT in &guidesdir;, &apt-preferences;, "
+"l'APT Howto."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:565
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -2961,20 +3136,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:87
-#, fuzzy
-#| msgid ""
-#| "Mount point; specify the location to mount the CD-ROM. This mount point "
-#| "must be listed in <filename>/etc/fstab</filename> and properly "
-#| "configured.  Configuration Item: <literal>Acquire::cdrom::mount</literal>."
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
 "cdrom::AutoDetect</literal>."
 msgstr ""
-"Punto di mount; specifica la posizione in cui montare il CD-ROM. Questo "
-"punto di mount deve essere elencato nel file <filename>/etc/fstab</filename> "
-"e configurato correttamente. Voce di configurazione: <literal>Acquire::"
-"cdrom::mount</literal>."
+"Non cercare di rilevare automaticamente il percorso del CD-ROM. Solitamente "
+"usato insieme all'opzione <option>--cdrom</option>. Voce di configurazione: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:95
@@ -3519,7 +3688,21 @@ msgstr ""
 "quando sono registrate con <command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:182
+msgid ""
+"List of all build profiles enabled for build-dependency resolution, without "
+"the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
+"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
+"buildpackage; overrides the list notation."
+msgstr ""
+"Elenco dei profili di compilazione abilitati per la risoluzione delle "
+"dipendenze di compilazione, senza il prefisso dello spazio dei nomi "
+"«<literal>profile.</literal>». In modo predefinito questa lista è vuota. "
+"<envar>DEB_BUILD_PROFILES</envar>, come usata da &dpkg-buildpackage; ha la "
+"precedenza sulla notazione della lista."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:190
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3533,7 +3716,7 @@ msgstr ""
 "preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:187
+#: apt.conf.5.xml:196
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3542,7 +3725,7 @@ msgstr ""
 "di problemi ignori i pacchetti bloccati nel suo processo decisionale."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:201
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3556,7 +3739,7 @@ msgstr ""
 "reinstallarli."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:209
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3583,7 +3766,7 @@ msgstr ""
 "che dipende da A, dato che la dipendenza da A non è più soddisfatta."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:221
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3613,7 +3796,7 @@ msgstr ""
 "l'unico problema che può aiutare a prevenire."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:234
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3631,7 +3814,7 @@ msgstr ""
 "il processo di aggiornamento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:245
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3652,7 +3835,7 @@ msgstr ""
 "<command>dash</command> o qualsiasi altro da cui dipendono tali pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:248
+#: apt.conf.5.xml:257
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3690,14 +3873,14 @@ msgstr ""
 "della cache è disabilitata."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:273
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Definisce quali pacchetti sono considerati dipendenze di compilazione "
 "essenziali."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:268
+#: apt.conf.5.xml:277
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3706,7 +3889,7 @@ msgstr ""
 "documentazione per maggiori informazioni su queste opzioni."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:282
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3715,7 +3898,7 @@ msgstr ""
 "documentazione per maggiori informazioni su queste opzioni."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:278
+#: apt.conf.5.xml:287
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3724,12 +3907,12 @@ msgstr ""
 "documentazione per maggiori informazioni su queste opzioni."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:293
 msgid "The Acquire Group"
 msgstr "Il gruppo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:294
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3740,7 +3923,7 @@ msgstr ""
 "scaricamento stesso (vedere anche &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#: apt.conf.5.xml:301
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3762,7 +3945,7 @@ msgstr ""
 "ValidTime</literal> seguente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:314
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3782,7 +3965,7 @@ msgstr ""
 "dell'archivio in fondo al nome dell'opzione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:317
+#: apt.conf.5.xml:326
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3802,7 +3985,7 @@ msgstr ""
 "archivio aggiungendo l'etichetta dell'archivio in fondo al nome dell'opzione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:338
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3813,7 +3996,7 @@ msgstr ""
 "interamente i nuovi. Attiva in modo predefinito."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:341
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3831,7 +4014,7 @@ msgstr ""
 "completo invece delle patch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:342
+#: apt.conf.5.xml:351
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3846,7 +4029,7 @@ msgstr ""
 "literal> significa che viene aperta una connessione per ogni tipo di URI."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:350
+#: apt.conf.5.xml:359
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3856,7 +4039,7 @@ msgstr ""
 "ha avuto successo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:364
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3867,7 +4050,7 @@ msgstr ""
 "vero."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:369
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3886,7 +4069,7 @@ msgstr ""
 "la variabile d'ambiente <envar>http_proxy</envar>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:377
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3906,7 +4089,7 @@ msgstr ""
 "file .deb."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:378 apt.conf.5.xml:466
+#: apt.conf.5.xml:387 apt.conf.5.xml:475
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3916,7 +4099,7 @@ msgstr ""
 "quello per i dati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:390
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3936,7 +4119,7 @@ msgstr ""
 "con la specifica HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:388
+#: apt.conf.5.xml:397
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3945,14 +4128,7 @@ msgstr ""
 "meno le ridirezioni che sono abilitate in modo predefinito."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
-#, fuzzy
-#| msgid ""
-#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-#| "literal> which accepts integer values in kilobytes. The default value is "
-#| "0 which deactivates the limit and tries to use all available bandwidth "
-#| "(note that this option implicitly disables downloading from multiple "
-#| "servers at the same time.)"
+#: apt.conf.5.xml:400
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -3961,13 +4137,13 @@ msgid ""
 "multiple servers at the same time."
 msgstr ""
 "La quantità di banda utilizzata può essere limitata con <literal>Acquire::"
-"http::Dl-Limit</literal> che accetta valori interi in kilobyte. Il valore "
-"predefinito è 0 che disattiva il limite e cerca di usare tutta la banda "
-"disponibile (notare che questa opzione implicitamente disabilita lo "
-"scaricamento da più server contemporaneamente)."
+"http::Dl-Limit</literal> che accetta valori interi in kilobyte al secondo. "
+"Il valore predefinito è 0 che disattiva il limite e cerca di usare tutta la "
+"banda disponibile. Notare che questa opzione implicitamente disabilita lo "
+"scaricamento da più server contemporaneamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:398
+#: apt.conf.5.xml:407
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3979,7 +4155,7 @@ msgstr ""
 "conosciuto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -3991,9 +4167,18 @@ msgid ""
 "takes precedence over the legacy option name <literal>ProxyAutoDetect</"
 "literal>."
 msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> può essere usato per "
+"specificare un comando esterno per rilevare il proxy http da usare. Apt si "
+"aspetta che il comando produca in output il proxy sullo stdout nello stile "
+"<literal>http://proxy:porta/</literal>. Questo avrà la precedenza sul "
+"generico <literal>Acquire::http::Proxy</literal>, ma non su qualsiasi "
+"configurazione specifica di host proxy impostata con <literal>Acquire::http::"
+"Proxy::$HOST</literal>. Vedere il pacchetto &squid-deb-proxy-client; per un "
+"esempio di implementazione che usa avahi. Questa opzione ha la precedenza "
+"sull'opzione col nome obsoleto <literal>ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:429
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4010,7 +4195,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal> non è ancora supportata."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:437
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4051,7 +4236,7 @@ msgstr ""
 "literal> è la corrispondente opzione specifica per ciascun host."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:458
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4085,7 +4270,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:478
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -4101,7 +4286,7 @@ msgstr ""
 "uno specifico host (vedere il file di configurazione d'esempio)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:485
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4115,7 +4300,7 @@ msgstr ""
 "a causa della sua bassa efficienza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:490
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4131,13 +4316,13 @@ msgstr ""
 "parte dei server FTP non supporta la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"pippo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:499
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4159,7 +4344,7 @@ msgstr ""
 "comandi per lo smontaggio possono essere specificati usando UMount."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:512
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4168,13 +4353,13 @@ msgstr ""
 "literal>, che passa parametri aggiuntivi a gpgv."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:523
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>EstensioneFile</replaceable> \"<replaceable>NomeMetodo</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:518
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4193,19 +4378,19 @@ msgstr ""
 "metodo usato. La sintassi è: <placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:528
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:531
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:524
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4236,13 +4421,13 @@ msgstr ""
 "all'elenco, dato che verrà aggiunto automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:538
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:533
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4268,7 +4453,7 @@ msgstr ""
 "definito; aggiunge solamente il tipo indicato all'inizio dell'elenco."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:543
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4280,7 +4465,7 @@ msgstr ""
 "soprattutto per i mirror locali."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:541
+#: apt.conf.5.xml:550
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4294,7 +4479,7 @@ msgstr ""
 "modo predefinito è disabilitato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:558
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4313,13 +4498,13 @@ msgstr ""
 "codici di lingua lunghi sono particolarmente rari."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:575
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"it\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:563
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4358,7 +4543,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:576
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4372,22 +4557,22 @@ msgstr ""
 "implicito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv4 protocol."
-msgstr ""
+msgstr "Durante gli scaricamenti, forza l'uso del solo protocollo IPv4."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:582
+#: apt.conf.5.xml:591
 msgid "When downloading, force to use only the IPv6 protocol."
-msgstr ""
+msgstr "Durante gli scaricamenti, forza l'uso del solo protocollo IPv6."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:598
 msgid "Directories"
 msgstr "Directory"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:600
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4407,7 +4592,7 @@ msgstr ""
 "<filename>/</filename> o <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:607
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4429,7 +4614,7 @@ msgstr ""
 "la directory predefinita è contenuta in <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:616
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4444,7 +4629,7 @@ msgstr ""
 "configurazione specificato da <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:622
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4455,7 +4640,7 @@ msgstr ""
 "termine viene caricato il file di configurazione principale."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:626
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4472,7 +4657,7 @@ msgstr ""
 "specificano la posizione dei rispettivi programmi."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:634
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4493,7 +4678,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:647
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4511,12 +4696,12 @@ msgstr ""
 "questi modelli possono usare una sintassi con espressioni regolari."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:656
 msgid "APT in DSelect"
 msgstr "APT in DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:658
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4527,7 +4712,7 @@ msgstr ""
 "sezione <literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:663
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4549,7 +4734,7 @@ msgstr ""
 "scaricare i nuovi pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4559,7 +4744,7 @@ msgstr ""
 "installazione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:682
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4569,7 +4754,7 @@ msgstr ""
 "aggiornamento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:678
+#: apt.conf.5.xml:687
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4579,12 +4764,12 @@ msgstr ""
 "solo in caso di errore."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:693
 msgid "How APT calls &dpkg;"
 msgstr "Come APT invoca &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:694
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4593,7 +4778,7 @@ msgstr ""
 "&dpkg;; sono nella sezione <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:699
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4604,7 +4789,7 @@ msgstr ""
 "passata a &dpkg; come un singolo argomento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:696
+#: apt.conf.5.xml:705
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4617,14 +4802,7 @@ msgstr ""
 "bin/sh</filename>; se qualcuno dei comandi fallisce APT terminerà annullando."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:703
-#, fuzzy
-#| msgid ""
-#| "This is a list of shell commands to run before invoking &dpkg;. Like "
-#| "<literal>options</literal> this must be specified in list notation. The "
-#| "commands are invoked in order using <filename>/bin/sh</filename>; should "
-#| "any fail APT will abort. APT will pass the filenames of all .deb files it "
-#| "is going to install to the commands, one per line on standard input."
+#: apt.conf.5.xml:712
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4638,17 +4816,11 @@ msgstr ""
 "le liste. I comandi sono invocati in ordine usando <filename>/bin/sh</"
 "filename>; se qualcuno dei comandi fallisce APT terminerà annullando. APT "
 "passa i nomi di file di tutti i file .deb che sta per installare ai comandi, "
-"uno per riga, sullo standard input."
+"uno per riga sul descrittore di file richiesto, usando in modo predefinito "
+"lo standard input."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:710
-#, fuzzy
-#| msgid ""
-#| "Version 2 of this protocol dumps more information, including the protocol "
-#| "version, the APT configuration space and the packages, files and versions "
-#| "being changed. Version 2 is enabled by setting <literal>DPkg::Tools::"
-#| "options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command "
-#| "given to <literal>Pre-Install-Pkgs</literal>."
+#: apt.conf.5.xml:719
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4657,13 +4829,12 @@ msgid ""
 msgstr ""
 "La versione 2 di questo protocollo fa il dump di più informazioni, inclusi "
 "la versione del protocollo, lo spazio di configurazione di APT, e i "
-"pacchetti, file e versioni che vengono modificati. La versione 2 viene "
-"abilitata impostando <literal>DPkg::Tools::options::cmd::Version</literal> a "
-"2. <literal>cmd</literal> è un comando passato a <literal>Pre-Install-Pkgs</"
-"literal>."
+"pacchetti, file e versioni che vengono modificati. La versione 3 aggiunge "
+"l'architettura e il contrassegno <literal>MultiArch</literal> per ciascuna "
+"versione di cui viene fatto il dump."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:724
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4672,9 +4843,15 @@ msgid ""
 "the requested version it will send the information in the highest version it "
 "has support for instead."
 msgstr ""
+"La versione del protocollo da usare per il comando "
+"<literal><replaceable>cmd</replaceable></literal> può essere scelta "
+"impostando in modo appropriato <literal>DPkg::Tools::options::"
+"<replaceable>cmd</replaceable>::Version</literal>, il cui valore predefinito "
+"è la versione 1. Se APT non supporta la versione richiesta invierà invece "
+"l'informazione nella versione più alta per cui ha il supporto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:731
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4683,9 +4860,16 @@ msgid ""
 "looking for the environment variable <envar>APT_HOOK_INFO_FD</envar> which "
 "contains the number of the used file descriptor as a confirmation."
 msgstr ""
+"Il descrittore di file da usare per inviare le informazioni può essere "
+"richiesto con <literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::"
+"InfoFD</literal> che è in modo predefinito <literal>0</literal> per lo "
+"standard input ed è disponibile a partire dalla versione 0.9.11. Il supporto "
+"per l'opzione può essere controllato guardando la variabile d'ambiente "
+"<envar>APT_HOOK_INFO_FD</envar> che contiene il numero del descrittore di "
+"file usato per conferma."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:741
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4694,7 +4878,7 @@ msgstr ""
 "valore predefinito è <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:746
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4704,12 +4888,12 @@ msgstr ""
 "binari."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:751
 msgid "dpkg trigger usage (and related options)"
 msgstr "Uso dei trigger di dpkg (e relative opzioni)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:752
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4737,7 +4921,7 @@ msgstr ""
 "pacchetti."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:767
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4751,7 +4935,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:761
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4775,7 +4959,7 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:774
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4797,7 +4981,7 @@ msgstr ""
 "questa opzione anche alle chiamate per lo spacchettamento e la rimozione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:782
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4827,7 +5011,7 @@ msgstr ""
 "potrebbe finire in uno stato non configurato e potenzialmente non avviabile."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:797
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4845,7 +5029,7 @@ msgstr ""
 "si può disattivare questa opzione in tutte le esecuzioni tranne l'ultima."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:804
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4861,7 +5045,7 @@ msgstr ""
 "necessari per configurare il pacchetto in questione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:817
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4879,7 +5063,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:810
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4904,12 +5088,12 @@ msgstr ""
 "con i loro valori predefiniti. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:830
 msgid "Periodic and Archives options"
 msgstr "Opzioni Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:831
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4923,12 +5107,12 @@ msgstr ""
 "all'inizio dello script."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:839
 msgid "Debug options"
 msgstr "Opzioni di debug"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:841
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4946,7 +5130,7 @@ msgstr ""
 "esserlo:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:852
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4957,7 +5141,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:860
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4968,7 +5152,7 @@ msgstr ""
 "install</literal>) come utente non root."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:869
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4980,7 +5164,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:877
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4989,37 +5173,37 @@ msgstr ""
 "negli ID dei CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:887
 msgid "A full list of debugging options to apt follows."
 msgstr "Segue un elenco completo delle opzioni di debug per apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:896
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "Stampa informazioni relative all'accesso a fonti <literal>cdrom://</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:907
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:918
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:929
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:940
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5028,7 +5212,7 @@ msgstr ""
 "usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:951
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5037,14 +5221,14 @@ msgstr ""
 "pacchetti memorizzati su CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:961
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Descrive il processo di risoluzione delle dipendenze di compilazione in &apt-"
 "get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:971
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5053,7 +5237,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:981
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5064,7 +5248,7 @@ msgstr ""
 "system del CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:992
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5074,14 +5258,14 @@ msgstr ""
 "contemporaneamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1004
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Registra nel log quando vengono aggiunte o rimosse voci dalla coda globale "
 "degli scaricamenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1014
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5090,7 +5274,7 @@ msgstr ""
 "codici di controllo e delle firme di cifratura dei file scaricati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1024
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5100,7 +5284,7 @@ msgstr ""
 "diff."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1036
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5110,7 +5294,7 @@ msgstr ""
 "invece degli indici completi."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1047
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5118,7 +5302,7 @@ msgstr ""
 "realmente gli scaricamenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1049
+#: apt.conf.5.xml:1058
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5127,7 +5311,7 @@ msgstr ""
 "installato dei pacchetti e alla rimozione dei pacchetti non utilizzati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1059
+#: apt.conf.5.xml:1068
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5143,7 +5327,7 @@ msgstr ""
 "pkgProblemResolver</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1082
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5175,7 +5359,7 @@ msgstr ""
 "sezione in cui compare il pacchetto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1094
+#: apt.conf.5.xml:1103
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5184,7 +5368,7 @@ msgstr ""
 "gli argomenti separati da un singolo carattere di spazio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1114
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5193,7 +5377,7 @@ msgstr ""
 "di stato ed ogni errore incontrato durante la sua analisi."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1125
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5202,7 +5386,7 @@ msgstr ""
 "literal> deve passare i pacchetti a &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1137
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5210,12 +5394,12 @@ msgstr ""
 "nell'invocazione di &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1139
+#: apt.conf.5.xml:1148
 msgid "Output the priority of each package list on startup."
 msgstr "Produce in output la priorità di ogni elenco di pacchetti all'avvio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1149
+#: apt.conf.5.xml:1158
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5225,7 +5409,7 @@ msgstr ""
 "dipendenze)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1160
+#: apt.conf.5.xml:1169
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5236,7 +5420,7 @@ msgstr ""
 "la stessa descritta in <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1172
+#: apt.conf.5.xml:1181
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5244,14 +5428,22 @@ msgstr ""
 "Stampa informazioni sui fornitori lette da <filename>/etc/apt/vendors.list</"
 "filename>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:1191
+msgid ""
+"Display the external commands that are called by apt hooks.  This includes e."
+"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Esempi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1195
+#: apt.conf.5.xml:1216
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5261,7 +5453,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1207
+#: apt.conf.5.xml:1228
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -6743,10 +6935,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:82
-#, fuzzy, no-wrap
-#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ opzioni ] uri distribuzione [componente1] [componente2] [...]"
+msgstr "deb [ opzioni ] uri suite [componente1] [componente2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: sources.list.5.xml:86
@@ -6770,6 +6961,23 @@ msgid ""
 "     [option1]: [option1-value]\n"
 "   "
 msgstr ""
+"     Types: deb deb-src\n"
+"     URIs: http://example.com\n"
+"     Suites: stable testing\n"
+"     Sections: componente1 componente2\n"
+"     Description: breve\n"
+"      lunga lunga lunga\n"
+"     [opzione1]: [valore-opzione1]\n"
+"\n"
+"     Types: deb\n"
+"     URIs: http://another.example.com\n"
+"     Suites: experimental\n"
+"     Sections: componente1 componente2\n"
+"     Enabled: no\n"
+"     Description:breve\n"
+"      lunga lunga lunga\n"
+"     [opzione1]: [valore-opzione1]\n"
+"   "
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:84
@@ -6777,19 +6985,11 @@ msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
+"In alternativa è gestito anche un formato in stile rfc822: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:105
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs.  "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (<literal>/</literal>). This is useful for the case when "
-#| "only a particular sub-section of the archive denoted by the URI is of "
-#| "interest.  If <literal>distribution</literal> does not specify an exact "
-#| "path, at least one <literal>component</literal> must be present."
 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
@@ -6801,26 +7001,16 @@ msgid ""
 "<literal>component</literal> must be present."
 msgstr ""
 "L'URI per il tipo <literal>deb</literal> deve specificare la base della "
-"distribuzione Debian, dalla quale APT troverà le informazioni necessarie. "
-"<literal>distribuzione</literal> può specificare un percorso esatto, nel "
-"qual caso le componenti devono essere omesse e <literal>distribuzione</"
-"literal> deve terminare con una sbarra (<literal>/</literal>). Questo è "
-"utile nel caso in cui si è interessati solo a una particolare sottosezione "
-"dell'archivio indicata dall'URI. Se <literal>distribuzione</literal> non "
-"specifica un percorso esatto, deve essere presente almeno una "
-"<literal>componente</literal>."
+"distribuzione Debian, dalla quale APT troverà le informazioni di cui ha "
+"bisogno. <literal>suite</literal> può specificare un percorso esatto, nel "
+"qual caso le componenti devono essere omesse e <literal>suite</literal> deve "
+"terminare con una sbarra (<literal>/</literal>). Questo è utile nel caso in "
+"cui si è interessati solo a una particolare sottosezione dell'archivio "
+"indicata dall'URI. Se <literal>suite</literal> non specifica un percorso "
+"esatto, deve essere presente almeno una <literal>componente</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:114
-#, fuzzy
-#| msgid ""
-#| "<literal>distribution</literal> may also contain a variable, <literal>"
-#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
-#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-#| "This permits architecture-independent <filename>sources.list</filename> "
-#| "files to be used. In general this is only of interest when specifying an "
-#| "exact path, <literal>APT</literal> will automatically generate a URI with "
-#| "the current architecture otherwise."
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -6830,29 +7020,16 @@ msgid ""
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""
-"<literal>distribuzione</literal> può anche contenere una variabile <literal>"
-"$(ARCH)</literal> che viene espansa nell'architettura Debian (come "
-"<literal>amd64</literal> o <literal>armel</literal>) usata nel sistema. Ciò "
-"consente di utilizzare file <filename>sources.list</filename> indipendenti "
+"<literal>suite</literal> può anche contenere una variabile <literal>$(ARCH)</"
+"literal> che viene espansa nell'architettura Debian (come <literal>amd64</"
+"literal> o <literal>armel</literal>) usata nel sistema. Ciò consente di "
+"utilizzare file <filename>sources.list</filename> indipendenti "
 "dall'architettura. In generale questo è interessante solo quando viene "
 "specificato un percorso esatto, altrimenti <literal>APT</literal> genera "
 "automaticamente un URI con l'architettura corrente."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:122
-#, fuzzy
-#| msgid ""
-#| "Since only one distribution can be specified per line it may be necessary "
-#| "to have multiple lines for the same URI, if a subset of all available "
-#| "distributions or components at that location is desired.  APT will sort "
-#| "the URI list after it has generated a complete set internally, and will "
-#| "collapse multiple references to the same Internet host, for instance, "
-#| "into a single connection, so that it does not inefficiently establish an "
-#| "FTP connection, close it, do something else, and then re-establish a "
-#| "connection to that same host. This feature is useful for accessing busy "
-#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
-#| "also parallelizes connections to different hosts to more effectively deal "
-#| "with sites with low bandwidth."
 msgid ""
 "In the traditional style sources.list format since only one distribution can "
 "be specified per line it may be necessary to have multiple lines for the "
@@ -6866,17 +7043,18 @@ msgid ""
 "users. APT also parallelizes connections to different hosts to more "
 "effectively deal with sites with low bandwidth."
 msgstr ""
-"Dato che può essere specificata solo una distribuzione per riga, può essere "
-"necessario avere più righe per lo stesso URI, se si desidera un sottoinsieme "
-"di tutte le distribuzioni o componenti disponibili in quella posizione. APT "
-"ordinerà la lista degli URI dopo aver generato internamente un insieme "
-"completo, e riunirà i riferimenti multipli, per esempio al medesimo host "
-"Internet in una singola connessione; in questo modo non stabilisce in modo "
-"inefficiente una connessione FTP per poi chiuderla, fare qualcos'altro e "
-"quindi ristabilire una connessione con il medesimo host. Questa funzionalità "
-"è utile per accedere a siti FTP molto impegnati con un limite al numero di "
-"accessi anonimi contemporanei. APT inoltre parallelizza le connessioni a "
-"host differenti, per gestire in maniera più efficiente i siti con scarsa "
+"Dato che, nel formato di sources.list in stile tradizionale, può essere "
+"specificata solo una distribuzione per riga, può essere necessario avere più "
+"righe per lo stesso URI, se si desidera un sottoinsieme di tutte le "
+"distribuzioni o componenti disponibili in quella posizione. APT ordinerà la "
+"lista degli URI dopo aver generato internamente un insieme completo, e "
+"riunirà i riferimenti multipli, per esempio al medesimo host Internet in una "
+"singola connessione; in questo modo non stabilisce in modo inefficiente una "
+"connessione FTP per poi chiuderla, fare qualcos'altro e quindi ristabilire "
+"una connessione con il medesimo host. Questa funzionalità è utile per "
+"accedere a siti FTP molto impegnati con un limite al numero di accessi "
+"anonimi contemporanei. APT inoltre parallelizza le connessioni a host "
+"differenti, per gestire in maniera più efficiente i siti con scarsa "
 "larghezza di banda."
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6913,24 +7091,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:146
-#, fuzzy
-#| msgid ""
-#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-#| "replaceable>,…</literal> can be used to specify for which architectures "
-#| "information should be downloaded. If this option is not set all "
-#| "architectures defined by the <literal>APT::Architectures</literal> option "
-#| "will be downloaded."
 msgid ""
 "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
 "<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
 "architectures from the set which will be downloaded."
 msgstr ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> può essere usato per specificare le architetture "
-"per le quali scaricare le informazioni. Se questa opzione non è impostata "
-"verranno scaricate tutte le architetture definite dall'opzione <literal>APT::"
-"Architectures</literal>."
+"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> e <literal>arch-=<replaceable>arch1</replaceable>,"
+"<replaceable>arch2</replaceable>,…</literal> possono essere usati per "
+"aggiungere e rimuovere architetture dall'insieme di quelle che verranno "
+"scaricate."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:149
@@ -7277,14 +7448,14 @@ msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
-"filenames of the form <filename>package.template.XXXX</filename> and "
-"<filename>package.config.XXXX</filename>"
+"filenames of the form <filename>package.template.XXXXXX</filename> and "
+"<filename>package.config.XXXXXX</filename>"
 msgstr ""
 "file-template e script-di-configurazione sono scritti nella directory "
 "temporanea specificata da <option>-t</option> o <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>), con i nomi dei file "
-"nella forma <filename>pacchetto.template.XXXX</filename> e "
-"<filename>pacchetto.config.XXXX</filename>"
+"nella forma <filename>pacchetto.template.XXXXXX</filename> e "
+"<filename>pacchetto.config.XXXXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:60
@@ -8308,126 +8479,6 @@ msgstr ""
 "<command>apt-ftparchive</command> restituisce zero in caso di funzionamento "
 "normale e il valore decimale 100 in caso di errore."
 
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "apt"
-msgstr "apt"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "16 June 1998"
-msgstr "16 giugno 1998"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "Debian"
-msgstr "Debian"
-
-#. type: SH
-#: apt.8:18
-#, no-wrap
-msgid "NAME"
-msgstr "NOME"
-
-#. type: Plain text
-#: apt.8:20
-msgid "apt - Advanced Package Tool"
-msgstr "apt - Advanced Package Tool (strumento avanzato per i pacchetti)"
-
-#. type: SH
-#: apt.8:20
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr "SINTASSI"
-
-#. type: Plain text
-#: apt.8:22
-msgid "B<apt>"
-msgstr "B<apt>"
-
-#. type: SH
-#: apt.8:22
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr "DESCRIZIONE"
-
-#. type: Plain text
-#: apt.8:31
-msgid ""
-"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-"System. Some options are only implemented in B<apt-get>(8)  though."
-msgstr ""
-"APT è un sistema di gestione per i pacchetti software. Per la normale "
-"gestione quotidiana dei pacchetti sono disponibili diverse interfacce, quali "
-"B<aptitude>(8) per la riga di comando o B<synaptic>(8) per il sistema X "
-"Window. Comunque alcune opzioni sono implementate solo in B<apt-get>(8)."
-
-#. type: SH
-#: apt.8:31
-#, no-wrap
-msgid "SEE ALSO"
-msgstr "VEDERE ANCHE"
-
-#. type: Plain text
-#: apt.8:38
-msgid ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-msgstr ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-
-#. type: SH
-#: apt.8:38
-#, no-wrap
-msgid "DIAGNOSTICS"
-msgstr "DIAGNOSTICA"
-
-#. type: Plain text
-#: apt.8:40
-msgid "apt returns zero on normal operation, decimal 100 on error."
-msgstr ""
-"apt restituisce zero in caso di funzionamento normale e il valore decimale "
-"100 in caso di errore."
-
-#. type: SH
-#: apt.8:40
-#, no-wrap
-msgid "BUGS"
-msgstr "BUG"
-
-#. type: Plain text
-#: apt.8:42
-msgid "This manpage isn't even started."
-msgstr "Questa pagina di manuale non è neanche stata iniziata."
-
-#. type: Plain text
-#: apt.8:51
-msgid ""
-"See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-"B<reportbug>(1)  command."
-msgstr ""
-"Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in B<apt>, "
-"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando "
-"B<reportbug>(1)."
-
-#. type: SH
-#: apt.8:51
-#, no-wrap
-msgid "AUTHOR"
-msgstr "AUTORE"
-
-#. type: Plain text
-#: apt.8:52
-msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-msgstr "apt è stato scritto dal Team APT E<lt>apt@packages.debian.orgE<gt>."
-
 #. type: <title></title>
 #: guide.sgml:4
 msgid "APT User's Guide"
@@ -9992,6 +10043,91 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
+#~ msgid "apt"
+#~ msgstr "apt"
+
+#~ msgid "16 June 1998"
+#~ msgstr "16 giugno 1998"
+
+#~ msgid "Debian"
+#~ msgstr "Debian"
+
+#~ msgid "NAME"
+#~ msgstr "NOME"
+
+#~ msgid "apt - Advanced Package Tool"
+#~ msgstr "apt - Advanced Package Tool (strumento avanzato per i pacchetti)"
+
+#~ msgid "SYNOPSIS"
+#~ msgstr "SINTASSI"
+
+#~ msgid "B<apt>"
+#~ msgstr "B<apt>"
+
+#~ msgid "DESCRIPTION"
+#~ msgstr "DESCRIZIONE"
+
+#, fuzzy
+#~| msgid ""
+#~| "APT is a management system for software packages. For normal day to day "
+#~| "package management there are several frontends available, such as "
+#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+#~| "System. Some options are only implemented in B<apt-get>(8)  though."
+#~ msgid ""
+#~ "For normal day to day package management there are several frontends "
+#~ "available, such as B<aptitude>(8)  for the command line or "
+#~ "B<synaptic>(8)  for the X Window System. Some options are only "
+#~ "implemented in B<apt-get>(8)  though."
+#~ msgstr ""
+#~ "APT è un sistema di gestione per i pacchetti software. Per la normale "
+#~ "gestione quotidiana dei pacchetti sono disponibili diverse interfacce, "
+#~ "quali B<aptitude>(8) per la riga di comando o B<synaptic>(8) per il "
+#~ "sistema X Window. Comunque alcune opzioni sono implementate solo in B<apt-"
+#~ "get>(8)."
+
+#~ msgid "SEE ALSO"
+#~ msgstr "VEDERE ANCHE"
+
+#, fuzzy
+#~| msgid ""
+#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~| "B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgid ""
+#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
+#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgstr ""
+#~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~ "B<apt_preferences>(5), B<apt-secure>(8)"
+
+#~ msgid "DIAGNOSTICS"
+#~ msgstr "DIAGNOSTICA"
+
+#~ msgid "apt returns zero on normal operation, decimal 100 on error."
+#~ msgstr ""
+#~ "apt restituisce zero in caso di funzionamento normale e il valore "
+#~ "decimale 100 in caso di errore."
+
+#~ msgid "BUGS"
+#~ msgstr "BUG"
+
+#~ msgid "This manpage isn't even started."
+#~ msgstr "Questa pagina di manuale non è neanche stata iniziata."
+
+#~ msgid ""
+#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
+#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "B<reportbug>(1)  command."
+#~ msgstr ""
+#~ "Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in "
+#~ "B<apt>, vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando "
+#~ "B<reportbug>(1)."
+
+#~ msgid "AUTHOR"
+#~ msgstr "AUTORE"
+
+#~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
+#~ msgstr "apt è stato scritto dal Team APT E<lt>apt@packages.debian.orgE<gt>."
+
 #~ msgid "Debian GNU/Linux"
 #~ msgstr "Debian GNU/Linux"
 
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 99c2ea2c3..2475b810d 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
-"PO-Revision-Date: 2012-08-08 07:58+0900\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
 "Language: \n"
@@ -657,33 +657,263 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"キーID\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27 apt-mark.8.xml:28
-#: apt-secure.8.xml:27 apt-cdrom.8.xml:27 apt-config.8.xml:28
+#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
+#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
+#: apt-config.8.xml:28
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28 apt-mark.8.xml:29
-#: apt-secure.8.xml:28 apt-cdrom.8.xml:28 apt-config.8.xml:29
-#: apt.conf.5.xml:34 apt_preferences.5.xml:28 sources.list.5.xml:29
-#: apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29 apt-ftparchive.1.xml:29
+#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
+#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
+#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
+#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
+#: apt-ftparchive.1.xml:29
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
-msgid "APT package handling utility -- command-line interface"
-msgstr "APT パッケージ操作ユーティリティ -- コマンドラインインターフェース"
+#: apt.8.xml:32
+msgid "command-line interface"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 apt-mark.8.xml:40
-#: apt-secure.8.xml:52 apt-cdrom.8.xml:39 apt-config.8.xml:40
-#: apt.conf.5.xml:43 apt_preferences.5.xml:38 sources.list.5.xml:38
-#: apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40 apt-ftparchive.1.xml:40
+#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
+#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
+#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
+#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
+#: apt-ftparchive.1.xml:40
 msgid "Description"
 msgstr "説明"
 
 #. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:38
+msgid ""
+"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
+"handling packages. It provides a commandline interface for the package "
+"management of the system.  See also &apt-get; and &apt-cache; for more low-"
+"level command options."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:47
+msgid ""
+"<literal>list</literal> is used to display a list of packages. It supports "
+"shell pattern for matching package names and the following options: "
+"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"versions</option> are supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:58
+msgid ""
+"<literal>search</literal> searches for the given term(s) and display "
+"matching packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:64
+#, fuzzy
+#| msgid ""
+#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
+#| "package has."
+msgid ""
+"<literal>show</literal> shows the package information for the given "
+"package(s)."
+msgstr ""
+"<literal>rdepends</literal> は、パッケージが持つ被依存関係を一覧表示します。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:71
+msgid ""
+"<literal>install</literal> is followed by one or more package names desired "
+"for installation or upgrading."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:75 apt-get.8.xml:118
+msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"パッケージにイコール記号とバージョンを続けることで、選択したバージョンのパッ"
+"ケージをインストールすることができます。つまり、指定のバージョンのパッケージ"
+"をインストールするように選択する、ということです。別の方法としては、ディスト"
+"リビューションを特定するのに、パッケージ名に続けて、スラッシュとディストリ"
+"ビューションのバージョンやアーカイブ名 (stable, testing, unstable) を記述でき"
+"ます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:85 apt-get.8.xml:153
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> は、パッケージが削除されることを除き、"
+"<literal>install</literal> と同様です。削除されたパッケージの設定ファイルは、"
+"システムに残ったままになることに注意してください。プラス記号がパッケージ名に "
+"(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス"
+"トールします。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:93
+msgid ""
+"<literal>edit-sources</literal> lets you edit your sources.list file and "
+"provides basic sanity checks."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:99
+#, fuzzy
+#| msgid ""
+#| "<literal>showhold</literal> is used to print a list of packages on hold "
+#| "in the same way as for the other show commands."
+msgid ""
+"<literal>update</literal> is used to resynchronize the package index files "
+"from their sources."
+msgstr ""
+"<literal>showhold</literal> は、他の show コマンドと同様に、保留されている"
+"パッケージを出力します。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:105
+msgid ""
+"<literal>upgrade</literal> is used to install the newest versions of all "
+"packages currently installed on the system from the sources enumerated in "
+"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
+"but existing package will never removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:114
+msgid ""
+"<literal>full-upgrade</literal> performs the function of upgrade but may "
+"also remove installed packages if that is required in order to resolve a "
+"package conflict."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
+#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
+#: apt-ftparchive.1.xml:506
+msgid "options"
+msgstr "オプション"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:134
+msgid "Script usage"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:136
+msgid ""
+"The &apt; commandline is designed as a end-user tool and it may change the "
+"output between versions. While it tries to not break backward compatibility "
+"there is no guarantee for it either.  All features of &apt; are available in "
+"&apt-cache; and &apt-get; via APT options. Please prefer using these "
+"commands in your scripts."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:144
+msgid "Differences to &apt-get;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:145
+msgid ""
+"The <command>apt</command> command is meant to be pleasant for end users and "
+"does not need to be backward compatible like &apt-get;. Therefore some "
+"options are different:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:151
+#, fuzzy
+#| msgid "the <literal>Package:</literal> line"
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgstr "<literal>Package:</literal> 行"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:155
+#, fuzzy
+#| msgid "the <literal>Component:</literal> line"
+msgid "The option <literal>APT::Color</literal> is enabled."
+msgstr "<literal>Component:</literal> 行"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:159
+msgid ""
+"A new <literal>list</literal> command is available similar to <literal>dpkg "
+"--list</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:164
+#, fuzzy
+#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+msgid ""
+"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
+"enabled by default."
+msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
+#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
+#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
+#: apt-ftparchive.1.xml:609
+msgid "See Also"
+msgstr "関連項目"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:175
+#, fuzzy
+#| msgid ""
+#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
+#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
+#| "preferences;, the APT Howto."
+msgid ""
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
+"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
+msgstr ""
+"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
+"&apt-config;, &apt-secure;, &guidesdir; にある APT ユーザガイド, &apt-"
+"preferences;, APT Howto"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
+#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
+#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+msgid "Diagnostics"
+msgstr "診断メッセージ"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:181
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
+#| "on error."
+msgid ""
+"<command>apt</command> returns zero on normal operation, decimal 100 on "
+"error."
+msgstr ""
+"<command>apt-get</command> は正常終了時に 0 を返します。エラー時には十進の "
+"100 を返します。"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-get.8.xml:35
+msgid "APT package handling utility -- command-line interface"
+msgstr "APT パッケージ操作ユーティリティ -- コマンドラインインターフェース"
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:41
 #, fuzzy
 #| msgid ""
@@ -828,23 +1058,6 @@ msgstr ""
 "断を上書きするのに利用される可能性があります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:118
-msgid ""
-"A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
-msgstr ""
-"パッケージにイコール記号とバージョンを続けることで、選択したバージョンのパッ"
-"ケージをインストールすることができます。つまり、指定のバージョンのパッケージ"
-"をインストールするように選択する、ということです。別の方法としては、ディスト"
-"リビューションを特定するのに、パッケージ名に続けて、スラッシュとディストリ"
-"ビューションのバージョンやアーカイブ名 (stable, testing, unstable) を記述でき"
-"ます。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:125
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
@@ -899,21 +1112,6 @@ msgstr ""
 "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:153
-msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"<literal>remove</literal> は、パッケージが削除されることを除き、"
-"<literal>install</literal> と同様です。削除されたパッケージの設定ファイルは、"
-"システムに残ったままになることに注意してください。プラス記号がパッケージ名に "
-"(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス"
-"トールします。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:161
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
@@ -1104,13 +1302,6 @@ msgstr ""
 "ストールされるバージョンの changelog を表示しますが、<option>install</"
 "option> コマンドと同じオプションを使用できます。"
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
-msgid "options"
-msgstr "オプション"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:262
 msgid ""
@@ -1311,13 +1502,21 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:370
+#, fuzzy
+#| msgid ""
+#| "This option controls the architecture packages are built for by "
+#| "<command>apt-get source --compile</command> and how cross-"
+#| "builddependencies are satisfied. By default is it not set which means "
+#| "that the host architecture is the same as the build architecture (which "
+#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
+#| "<literal>APT::Get::Host-Architecture</literal>"
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
 "is the same as the build architecture (which is defined by <literal>APT::"
 "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>"
+"Architecture</literal>."
 msgstr ""
 "このオプションは、<command>apt-get source --compile</command> で構築するパッ"
 "ケージのアーキテクチャや、どのようにクロス依存関係を解決するかを制御します。"
@@ -1327,6 +1526,29 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:380
+#, fuzzy
+#| msgid ""
+#| "This option controls the architecture packages are built for by "
+#| "<command>apt-get source --compile</command> and how cross-"
+#| "builddependencies are satisfied. By default is it not set which means "
+#| "that the host architecture is the same as the build architecture (which "
+#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
+#| "<literal>APT::Get::Host-Architecture</literal>"
+msgid ""
+"This option controls the activated build profiles for which a source package "
+"is built by <command>apt-get source --compile</command> and how build "
+"dependencies are satisfied. By default no build profile is active.  More "
+"than one build profile can be activated at a time by concatenating them with "
+"a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
+msgstr ""
+"このオプションは、<command>apt-get source --compile</command> で構築するパッ"
+"ケージのアーキテクチャや、どのようにクロス依存関係を解決するかを制御します。"
+"デフォルトでは未定義で、これはホストアーキテクチャは、(<literal>APT::"
+"Architecture</literal> で定義した) ビルドアーキテクチャと同じという意味になり"
+"ます。設定項目: <literal>APT::Get::Host-Architecture</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:391
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1335,7 +1557,7 @@ msgstr ""
 "Get::Compile</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:396
 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -1348,7 +1570,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:403
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1360,7 +1582,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:404
+#: apt-get.8.xml:415
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1373,7 +1595,7 @@ msgstr ""
 "Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:411
+#: apt-get.8.xml:422
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1386,7 +1608,7 @@ msgstr ""
 "定項目: <literal>APT::Get::Only-Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:430
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -1400,7 +1622,7 @@ msgstr ""
 "ん! 設定項目: <literal>APT::Get::force-yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:438
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "
@@ -1421,7 +1643,7 @@ msgstr ""
 "Print-URIs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:449
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1434,7 +1656,7 @@ msgstr ""
 "<literal>APT::Get::Purge</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:446
+#: apt-get.8.xml:457
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1443,7 +1665,7 @@ msgstr ""
 "定項目: <literal>APT::Get::ReInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:462
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1459,7 +1681,7 @@ msgstr ""
 "する時ぐらいでしょう。設定項目: <literal>APT::Get::List-Cleanup</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:461
+#: apt-get.8.xml:472
 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -1482,7 +1704,7 @@ msgstr ""
 "さい。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:476
+#: apt-get.8.xml:487
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1495,7 +1717,7 @@ msgstr ""
 "目: <literal>APT::Get::Trivial-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:494
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1504,7 +1726,7 @@ msgstr ""
 "項目: <literal>APT::Get::Remove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:500
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1517,7 +1739,7 @@ msgstr ""
 "<literal>APT::Get::AutomaticRemove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:507
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1535,7 +1757,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:518
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1546,7 +1768,7 @@ msgstr ""
 "<literal>APT::Get::Dsc-Only</literal>, <literal>APT::Get::Tar-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:524
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1555,7 +1777,7 @@ msgstr ""
 "<literal>APT::Get::Arch-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:529
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1566,32 +1788,23 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:535
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1200 apt_preferences.5.xml:700
+#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
+#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "ファイル"
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
-#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
-#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
-msgid "See Also"
-msgstr "関連項目"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:559
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1606,15 +1819,8 @@ msgstr ""
 "&apt-config;, &apt-secure;, &guidesdir; にある APT ユーザガイド, &apt-"
 "preferences;, APT Howto"
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
-msgid "Diagnostics"
-msgstr "診断メッセージ"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:565
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -3387,7 +3593,16 @@ msgstr ""
 "加します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:182
+msgid ""
+"List of all build profiles enabled for build-dependency resolution, without "
+"the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
+"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
+"buildpackage; overrides the list notation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:190
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3400,7 +3615,7 @@ msgstr ""
 "'4.0', '5.0*'  となります。&apt-preferences; も参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:187
+#: apt.conf.5.xml:196
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3409,7 +3624,7 @@ msgstr ""
 "パッケージを無視します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:201
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3423,7 +3638,7 @@ msgstr ""
 "注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:209
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3447,7 +3662,7 @@ msgstr ""
 "なり、A への依存関係は、もう満たせません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:221
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3472,7 +3687,7 @@ msgstr ""
 "述のシナリオを解決する方法の、1つにしかすぎないのです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:234
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3488,7 +3703,7 @@ msgstr ""
 "も報告していただきたいです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:245
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3509,7 +3724,7 @@ msgstr ""
 "それらが依存しているパッケージ以外の不可欠パッケージで動作します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:248
+#: apt.conf.5.xml:257
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3543,12 +3758,12 @@ msgstr ""
 "の自動増加を無効にします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:273
 msgid "Defines which packages are considered essential build dependencies."
 msgstr "構築依存関係で不可欠なパッケージを定義します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:268
+#: apt.conf.5.xml:277
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3557,7 +3772,7 @@ msgstr ""
 "&apt-get; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:282
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3566,7 +3781,7 @@ msgstr ""
 "は &apt-cache; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:278
+#: apt.conf.5.xml:287
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3575,12 +3790,12 @@ msgstr ""
 "は &apt-cdrom; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:293
 msgid "The Acquire Group"
 msgstr "Acquire グループ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:294
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3591,7 +3806,7 @@ msgstr ""
 "(&sources-list; も参照)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#: apt.conf.5.xml:301
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3611,7 +3826,7 @@ msgstr ""
 "下の <literal>Max-ValidTime</literal> オプションを使用できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:314
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3629,7 +3844,7 @@ msgstr ""
 "固有の設定を作成できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:317
+#: apt.conf.5.xml:326
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3647,7 +3862,7 @@ msgstr ""
 "定を作成できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:338
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3658,7 +3873,7 @@ msgstr ""
 "す。デフォルトでは True です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:341
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3674,7 +3889,7 @@ msgstr ""
 "も、パッチをダウンロードする代わりに、完全なファイルをダウンロードします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:342
+#: apt.conf.5.xml:351
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3688,7 +3903,7 @@ msgstr ""
 "<literal>access</literal> は、URI タイプごとに 1 接続を開きます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:350
+#: apt.conf.5.xml:359
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3697,7 +3912,7 @@ msgstr ""
 "えられた回数だけリトライを行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:364
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3707,7 +3922,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:369
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3725,7 +3940,7 @@ msgstr ""
 "ないと、環境変数 <envar>http_proxy</envar> を使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:377
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3744,7 +3959,7 @@ msgstr ""
 "が汚れるのを防げます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:378 apt.conf.5.xml:466
+#: apt.conf.5.xml:387 apt.conf.5.xml:475
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3754,7 +3969,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:390
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3772,7 +3987,7 @@ msgstr ""
 "フォルト値は 0 (= 無効) です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:388
+#: apt.conf.5.xml:397
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3781,7 +3996,7 @@ msgstr ""
 "かどうかを制御します。デフォルトでは有効です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:400
 #, fuzzy
 #| msgid ""
 #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
@@ -3802,7 +4017,7 @@ msgstr ""
 "ロードしなくなることに注意してください)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:398
+#: apt.conf.5.xml:407
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3813,7 +4028,7 @@ msgstr ""
 "ロードするための、異なる User-Agent を設定できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -3827,7 +4042,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:429
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3844,7 +4059,7 @@ msgstr ""
 "していません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:437
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3882,7 +4097,7 @@ msgstr ""
 "ごとのオプションです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:458
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -3914,7 +4129,7 @@ msgstr ""
 "literal>, <literal>$(SITE_PORT)</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:478
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -3929,7 +4144,7 @@ msgstr ""
 "定例はサンプル設定ファイルを参照してください)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:485
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -3942,7 +4157,7 @@ msgstr ""
 "FTP over HTTP を使用するのは推奨しません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:490
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3958,13 +4173,13 @@ msgstr ""
 "いことに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:499
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3985,7 +4200,7 @@ msgstr ""
 "マンドは UMount で指定することができます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:512
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -3994,13 +4209,13 @@ msgstr ""
 "る、<literal>gpgv::Options</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:523
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:518
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4018,19 +4233,19 @@ msgstr ""
 "す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:528
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:531
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:524
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4059,13 +4274,13 @@ msgstr ""
 "<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:538
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:533
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4089,7 +4304,7 @@ msgstr ""
 "のみ定義されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:543
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4100,7 +4315,7 @@ msgstr ""
 "んどローカルミラーでのみ有効になることに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:541
+#: apt.conf.5.xml:550
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4113,7 +4328,7 @@ msgstr ""
 "する際に、CPU の能力を余計に消費します。デフォルトでは false です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:558
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4131,13 +4346,13 @@ msgstr ""
 "意してください。長い言語コードは特に見かけません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:575
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:563
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4174,7 +4389,7 @@ msgstr ""
 "ことに注意してください。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:576
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4187,22 +4402,22 @@ msgstr ""
 "後) に追加します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:582
+#: apt.conf.5.xml:591
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:598
 msgid "Directories"
 msgstr "ディレクトリ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:600
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4221,7 +4436,7 @@ msgstr ""
 "サブアイテムすべてに、前に付加するデフォルトディレクトリを含んでいます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:607
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4242,7 +4457,7 @@ msgstr ""
 "様、<literal>Dir::Cache</literal> はデフォルトディレクトリを含んでいます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:616
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4256,7 +4471,7 @@ msgstr ""
 "ファイルを指定された場合のみ、この設定の効果があります)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:622
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4267,7 +4482,7 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:626
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4284,7 +4499,7 @@ msgstr ""
 "プログラムの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:634
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4304,7 +4519,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:647
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4320,12 +4535,12 @@ msgstr ""
 "フォルト値を見ればわかる通り、このパターンには正規表現を使用できます。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:656
 msgid "APT in DSelect"
 msgstr "DSelect での APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:658
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4336,7 +4551,7 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:663
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4357,7 +4572,7 @@ msgstr ""
 "パッケージをダウンロードする直前に行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4366,7 +4581,7 @@ msgstr ""
 "されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:682
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4375,7 +4590,7 @@ msgstr ""
 "されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:678
+#: apt.conf.5.xml:687
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4384,12 +4599,12 @@ msgstr ""
 "します。デフォルトはエラーが発生した場合のみです。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:693
 msgid "How APT calls &dpkg;"
 msgstr "APT が &dpkg; を呼ぶ方法"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:694
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4398,7 +4613,7 @@ msgstr ""
 "<literal>DPkg</literal> セクションにあります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:699
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4408,7 +4623,7 @@ msgstr ""
 "なければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:696
+#: apt.conf.5.xml:705
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4420,7 +4635,7 @@ msgstr ""
 "bin/sh</filename> を通して呼び出され、何か問題があれば APT が異常終了します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:712
 #, fuzzy
 #| msgid ""
 #| "This is a list of shell commands to run before invoking &dpkg;. Like "
@@ -4443,7 +4658,7 @@ msgstr ""
 "マンドの標準入力に送ります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:719
 #, fuzzy
 #| msgid ""
 #| "Version 2 of this protocol dumps more information, including the protocol "
@@ -4464,7 +4679,7 @@ msgstr ""
 "Install-Pkgs</literal> で与えられるコマンドです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:724
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4475,7 +4690,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:731
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4486,7 +4701,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:741
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4495,7 +4710,7 @@ msgstr ""
 "<filename>/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:746
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4504,12 +4719,12 @@ msgstr ""
 "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:751
 msgid "dpkg trigger usage (and related options)"
 msgstr "dpkg トリガの使い方 (および関連オプション)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:752
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4533,7 +4748,7 @@ msgstr ""
 "(もしくはそれ以上) の時間 100% のままとなり、進捗レポートを壊してしまいます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:767
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4547,7 +4762,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:761
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4570,7 +4785,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:774
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4590,7 +4805,7 @@ msgstr ""
 "在 APT は、このフラグを、展開呼び出しや削除呼び出しにも追加します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:782
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4617,7 +4832,7 @@ msgstr ""
 "能性があるからです。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:797
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4634,7 +4849,7 @@ msgstr ""
 "では、最後以外のすべての実行で、無効にできます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:804
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4649,7 +4864,7 @@ msgstr ""
 "ことに注意してください。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:817
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4667,7 +4882,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:810
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4690,12 +4905,12 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:830
 msgid "Periodic and Archives options"
 msgstr "Periodic オプションと Archives オプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:831
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4708,12 +4923,12 @@ msgstr ""
 "トは、このスクリプトの先頭を参照してください。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:839
 msgid "Debug options"
 msgstr "デバッグオプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:841
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4729,7 +4944,7 @@ msgstr ""
 "のオプションは興味がないでしょうが、以下のものは興味を引くかもしれません。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:852
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4740,7 +4955,7 @@ msgstr ""
 "にします。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:860
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4751,7 +4966,7 @@ msgstr ""
 "literal>) を行う場合に使用します。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:869
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4763,7 +4978,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:877
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4772,34 +4987,34 @@ msgstr ""
 "ないようにします。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:887
 msgid "A full list of debugging options to apt follows."
 msgstr "以下は apt に対するデバッグオプションのすべてです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:896
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:907
 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:918
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:929
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:940
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -4807,7 +5022,7 @@ msgstr ""
 "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:951
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -4816,12 +5031,12 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:961
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:971
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -4829,7 +5044,7 @@ msgstr ""
 "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:981
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4839,7 +5054,7 @@ msgstr ""
 "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:992
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4848,13 +5063,13 @@ msgstr ""
 "<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1004
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1014
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -4863,7 +5078,7 @@ msgstr ""
 "ジやエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1024
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -4872,7 +5087,7 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1036
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -4881,14 +5096,14 @@ msgstr ""
 "リストへのパッチ適用に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1047
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1049
+#: apt.conf.5.xml:1058
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -4897,7 +5112,7 @@ msgstr ""
 "に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1059
+#: apt.conf.5.xml:1068
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -4912,7 +5127,7 @@ msgstr ""
 "路に対応しています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1082
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -4941,7 +5156,7 @@ msgstr ""
 "ます。<literal>section</literal> はパッケージが現れるセクション名です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1094
+#: apt.conf.5.xml:1103
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -4950,7 +5165,7 @@ msgstr ""
 "切られます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1114
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -4959,7 +5174,7 @@ msgstr ""
 "を解析中に発生したエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1125
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -4968,18 +5183,18 @@ msgstr ""
 "のトレースを生成します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1137
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1139
+#: apt.conf.5.xml:1148
 msgid "Output the priority of each package list on startup."
 msgstr "起動時の各パッケージの優先度を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1149
+#: apt.conf.5.xml:1158
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -4988,7 +5203,7 @@ msgstr ""
 "した場合にのみ、適用されます)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1160
+#: apt.conf.5.xml:1169
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -4999,7 +5214,7 @@ msgstr ""
 "説明したものと同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1172
+#: apt.conf.5.xml:1181
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5007,14 +5222,22 @@ msgstr ""
 "<filename>/etc/apt/vendors.list</filename> から読み込んだ、ベンダの情報を出力"
 "します。"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:1191
+msgid ""
+"Display the external commands that are called by apt hooks.  This includes e."
+"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "サンプル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1195
+#: apt.conf.5.xml:1216
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5024,7 +5247,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1207
+#: apt.conf.5.xml:1228
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -6971,14 +7194,14 @@ msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
-"filenames of the form <filename>package.template.XXXX</filename> and "
-"<filename>package.config.XXXX</filename>"
+"filenames of the form <filename>package.template.XXXXXX</filename> and "
+"<filename>package.config.XXXXXX</filename>"
 msgstr ""
 "テンプレートファイルや、設定スクリプトは、<option>-t</option> や <option>--"
 "tempdir</option> で指定した一時ディレクトリ (<literal>APT::ExtractTemplates::"
 "TempDir</literal>) に書き出され、ファイル名は、<filename>package.template."
-"XXXX</filename> や <filename>package.config.XXXX</filename> といった形になり"
-"ます。"
+"XXXXXX</filename> や <filename>package.config.XXXXXX</filename> といった形に"
+"なります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:60
@@ -7971,125 +8194,6 @@ msgstr ""
 "<command>apt-ftparchive</command> は正常終了時に 0 を返します。エラー時には十"
 "進の 100 を返します。"
 
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "apt"
-msgstr "apt"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "16 June 1998"
-msgstr "16 June 1998"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "Debian"
-msgstr "Debian"
-
-#. type: SH
-#: apt.8:18
-#, no-wrap
-msgid "NAME"
-msgstr "名前"
-
-#. type: Plain text
-#: apt.8:20
-msgid "apt - Advanced Package Tool"
-msgstr "apt - 高度パッケージツール"
-
-#. type: SH
-#: apt.8:20
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr "書式"
-
-#. type: Plain text
-#: apt.8:22
-msgid "B<apt>"
-msgstr "B<apt>"
-
-#. type: SH
-#: apt.8:22
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr "説明"
-
-#. type: Plain text
-#: apt.8:31
-msgid ""
-"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-"System. Some options are only implemented in B<apt-get>(8)  though."
-msgstr ""
-"APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため"
-"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の "
-"B<synaptic>(8) といった、いくつかのフロントエンドが用意されています。いくつか"
-"のオプションは B<apt-get>(8) にしか実装されていません。"
-
-#. type: SH
-#: apt.8:31
-#, no-wrap
-msgid "SEE ALSO"
-msgstr "関連項目"
-
-#. type: Plain text
-#: apt.8:38
-msgid ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-msgstr ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-
-#. type: SH
-#: apt.8:38
-#, no-wrap
-msgid "DIAGNOSTICS"
-msgstr "診断メッセージ"
-
-#. type: Plain text
-#: apt.8:40
-msgid "apt returns zero on normal operation, decimal 100 on error."
-msgstr "apt は正常終了時に 0 を返します。エラー時には十進の 100 を返します。"
-
-#. type: SH
-#: apt.8:40
-#, no-wrap
-msgid "BUGS"
-msgstr "バグ"
-
-#. type: Plain text
-#: apt.8:42
-msgid "This manpage isn't even started."
-msgstr "このマニュアルページは、始まってさえいません。"
-
-#. type: Plain text
-#: apt.8:51
-msgid ""
-"See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-"B<reportbug>(1)  command."
-msgstr ""
-"E<lt>http://bugs.debian.org/aptE<gt> をご覧ください。B<apt> のバグを報告する"
-"場合は、I</usr/share/doc/debian/bug-reporting.txt> や B<reportbug>(1) コマン"
-"ドをご覧ください。"
-
-#. type: SH
-#: apt.8:51
-#, no-wrap
-msgid "AUTHOR"
-msgstr "著者"
-
-#. type: Plain text
-#: apt.8:52
-msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-msgstr ""
-"apt は APT チーム E<lt>apt@packages.debian.orgE<gt> によって書かれました。"
-
 #. type: <title></title>
 #: guide.sgml:4
 msgid "APT User's Guide"
@@ -9273,6 +9377,90 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
 
+#~ msgid "apt"
+#~ msgstr "apt"
+
+#~ msgid "16 June 1998"
+#~ msgstr "16 June 1998"
+
+#~ msgid "Debian"
+#~ msgstr "Debian"
+
+#~ msgid "NAME"
+#~ msgstr "名前"
+
+#~ msgid "apt - Advanced Package Tool"
+#~ msgstr "apt - 高度パッケージツール"
+
+#~ msgid "SYNOPSIS"
+#~ msgstr "書式"
+
+#~ msgid "B<apt>"
+#~ msgstr "B<apt>"
+
+#~ msgid "DESCRIPTION"
+#~ msgstr "説明"
+
+#, fuzzy
+#~| msgid ""
+#~| "APT is a management system for software packages. For normal day to day "
+#~| "package management there are several frontends available, such as "
+#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+#~| "System. Some options are only implemented in B<apt-get>(8)  though."
+#~ msgid ""
+#~ "For normal day to day package management there are several frontends "
+#~ "available, such as B<aptitude>(8)  for the command line or "
+#~ "B<synaptic>(8)  for the X Window System. Some options are only "
+#~ "implemented in B<apt-get>(8)  though."
+#~ msgstr ""
+#~ "APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため"
+#~ "に、コマンドライン用の B<aptitude>(8) や、X Window System 用の "
+#~ "B<synaptic>(8) といった、いくつかのフロントエンドが用意されています。いく"
+#~ "つかのオプションは B<apt-get>(8) にしか実装されていません。"
+
+#~ msgid "SEE ALSO"
+#~ msgstr "関連項目"
+
+#, fuzzy
+#~| msgid ""
+#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~| "B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgid ""
+#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
+#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgstr ""
+#~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~ "B<apt_preferences>(5), B<apt-secure>(8)"
+
+#~ msgid "DIAGNOSTICS"
+#~ msgstr "診断メッセージ"
+
+#~ msgid "apt returns zero on normal operation, decimal 100 on error."
+#~ msgstr ""
+#~ "apt は正常終了時に 0 を返します。エラー時には十進の 100 を返します。"
+
+#~ msgid "BUGS"
+#~ msgstr "バグ"
+
+#~ msgid "This manpage isn't even started."
+#~ msgstr "このマニュアルページは、始まってさえいません。"
+
+#~ msgid ""
+#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
+#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "B<reportbug>(1)  command."
+#~ msgstr ""
+#~ "E<lt>http://bugs.debian.org/aptE<gt> をご覧ください。B<apt> のバグを報告す"
+#~ "る場合は、I</usr/share/doc/debian/bug-reporting.txt> や B<reportbug>(1) コ"
+#~ "マンドをご覧ください。"
+
+#~ msgid "AUTHOR"
+#~ msgstr "著者"
+
+#~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
+#~ msgstr ""
+#~ "apt は APT チーム E<lt>apt@packages.debian.orgE<gt> によって書かれました。"
+
 #~ msgid "Debian GNU/Linux"
 #~ msgstr "Debian GNU/Linux"
 
diff --git a/doc/po/pl.po b/doc/po/pl.po
index dda23a5d3..5f92c521c 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
-"PO-Revision-Date: 2012-07-28 21:59+0200\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"PO-Revision-Date: 2014-04-01 13:59+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -657,34 +657,269 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"id_klucza\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27 apt-mark.8.xml:28
-#: apt-secure.8.xml:27 apt-cdrom.8.xml:27 apt-config.8.xml:28
+#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
+#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
+#: apt-config.8.xml:28
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28 apt-mark.8.xml:29
-#: apt-secure.8.xml:28 apt-cdrom.8.xml:28 apt-config.8.xml:29
-#: apt.conf.5.xml:34 apt_preferences.5.xml:28 sources.list.5.xml:29
-#: apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29 apt-ftparchive.1.xml:29
+#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
+#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
+#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
+#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
+#: apt-ftparchive.1.xml:29
 msgid "APT"
 msgstr "APT"
 
-#
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
-msgid "APT package handling utility -- command-line interface"
-msgstr "Narzędzie zarządzania pakietami APT -- interfejs linii poleceń"
+#: apt.8.xml:32
+msgid "command-line interface"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 apt-mark.8.xml:40
-#: apt-secure.8.xml:52 apt-cdrom.8.xml:39 apt-config.8.xml:40
-#: apt.conf.5.xml:43 apt_preferences.5.xml:38 sources.list.5.xml:38
-#: apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40 apt-ftparchive.1.xml:40
+#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
+#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
+#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
+#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
+#: apt-ftparchive.1.xml:40
 msgid "Description"
 msgstr "Opis"
 
 #. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:38
+msgid ""
+"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
+"handling packages. It provides a commandline interface for the package "
+"management of the system.  See also &apt-get; and &apt-cache; for more low-"
+"level command options."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:47
+msgid ""
+"<literal>list</literal> is used to display a list of packages. It supports "
+"shell pattern for matching package names and the following options: "
+"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"versions</option> are supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:58
+msgid ""
+"<literal>search</literal> searches for the given term(s) and display "
+"matching packages."
+msgstr ""
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:64
+#, fuzzy
+#| msgid ""
+#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
+#| "package has."
+msgid ""
+"<literal>show</literal> shows the package information for the given "
+"package(s)."
+msgstr ""
+"<literal>rdepends</literal> pokazuje listę wszystkich odwrotnych zależności "
+"danego pakietu."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:71
+msgid ""
+"<literal>install</literal> is followed by one or more package names desired "
+"for installation or upgrading."
+msgstr ""
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:75 apt-get.8.xml:118
+msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"Konkretna wersja pakietu może być wybrana do zainstalowania przez "
+"umieszczenie po nazwie pakietu znaku równości, a za nim wybranej wersji "
+"pakietu. Podana wersja zostanie wyszukana i wybrana do zainstalowania.  "
+"Również konkretna dystrybucja może być wybrana przez umieszczenie po nazwie "
+"pakietu znaku ukośnika, po którym następuje wersja dystrybucji bądź nazwa "
+"archiwum (stable, testing, unstable)."
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:85 apt-get.8.xml:153
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> odpowiada poleceniu <literal>install</literal> z "
+"tą różnicą, że pakiety są usuwane, a nie instalowane. Jeżeli nazwa pakietu "
+"zostanie poprzedzona znakiem plusa (bez rozdzielającej spacji), wskazany "
+"pakiet zostanie zainstalowany zamiast zostać usunięty."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:93
+msgid ""
+"<literal>edit-sources</literal> lets you edit your sources.list file and "
+"provides basic sanity checks."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:99
+#, fuzzy
+#| msgid ""
+#| "<literal>showhold</literal> is used to print a list of packages on hold "
+#| "in the same way as for the other show commands."
+msgid ""
+"<literal>update</literal> is used to resynchronize the package index files "
+"from their sources."
+msgstr ""
+"<literal>showhold</literal> jest używane do wypisania listy wszystkich "
+"pakietów wstrzymanych, w taki sam sposób jak pozostałe polecenia \"show\"."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:105
+msgid ""
+"<literal>upgrade</literal> is used to install the newest versions of all "
+"packages currently installed on the system from the sources enumerated in "
+"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
+"but existing package will never removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:114
+msgid ""
+"<literal>full-upgrade</literal> performs the function of upgrade but may "
+"also remove installed packages if that is required in order to resolve a "
+"package conflict."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
+#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
+#: apt-ftparchive.1.xml:506
+msgid "options"
+msgstr "opcje"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:134
+msgid "Script usage"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:136
+msgid ""
+"The &apt; commandline is designed as a end-user tool and it may change the "
+"output between versions. While it tries to not break backward compatibility "
+"there is no guarantee for it either.  All features of &apt; are available in "
+"&apt-cache; and &apt-get; via APT options. Please prefer using these "
+"commands in your scripts."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:144
+msgid "Differences to &apt-get;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:145
+msgid ""
+"The <command>apt</command> command is meant to be pleasant for end users and "
+"does not need to be backward compatible like &apt-get;. Therefore some "
+"options are different:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:151
+#, fuzzy
+#| msgid "the <literal>Package:</literal> line"
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgstr "linia <literal>Package:</literal>"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:155
+#, fuzzy
+#| msgid "the <literal>Component:</literal> line"
+msgid "The option <literal>APT::Color</literal> is enabled."
+msgstr "linia <literal>Component:</literal>"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:159
+msgid ""
+"A new <literal>list</literal> command is available similar to <literal>dpkg "
+"--list</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:164
+#, fuzzy
+#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+msgid ""
+"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
+"enabled by default."
+msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
+#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
+#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
+#: apt-ftparchive.1.xml:609
+msgid "See Also"
+msgstr "Zobacz także"
+
+#
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:175
+#, fuzzy
+#| msgid ""
+#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
+#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
+#| "preferences;, the APT Howto."
+msgid ""
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
+"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
+msgstr ""
+"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
+"&apt-config;, &apt-secure;, Przewodnik APT dla użytkowników w &guidesdir;, "
+"&apt-preferences;, APT Howto."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
+#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
+#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+msgid "Diagnostics"
+msgstr "Diagnostyka"
+
+#
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:181
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
+#| "on error."
+msgid ""
+"<command>apt</command> returns zero on normal operation, decimal 100 on "
+"error."
+msgstr ""
+"<command>apt-get</command> zwraca zero, gdy zakończyło się pomyślnie, 100 - "
+"w przypadku błędu."
+
+#
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-get.8.xml:35
+msgid "APT package handling utility -- command-line interface"
+msgstr "Narzędzie zarządzania pakietami APT -- interfejs linii poleceń"
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:41
 #, fuzzy
 #| msgid ""
@@ -842,24 +1077,6 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:118
-msgid ""
-"A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
-msgstr ""
-"Konkretna wersja pakietu może być wybrana do zainstalowania przez "
-"umieszczenie po nazwie pakietu znaku równości, a za nim wybranej wersji "
-"pakietu. Podana wersja zostanie wyszukana i wybrana do zainstalowania.  "
-"Również konkretna dystrybucja może być wybrana przez umieszczenie po nazwie "
-"pakietu znaku ukośnika, po którym następuje wersja dystrybucji bądź nazwa "
-"archiwum (stable, testing, unstable)."
-
-#
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:125
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
@@ -921,21 +1138,6 @@ msgstr ""
 "początek lub koniec dopasowania wyrażenia regularnego, używając znaków \"^| "
 "lub \"$\", można też stworzyć bardziej specyficzne wyrażenie regularne."
 
-#
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:153
-msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"<literal>remove</literal> odpowiada poleceniu <literal>install</literal> z "
-"tą różnicą, że pakiety są usuwane, a nie instalowane. Jeżeli nazwa pakietu "
-"zostanie poprzedzona znakiem plusa (bez rozdzielającej spacji), wskazany "
-"pakiet zostanie zainstalowany zamiast zostać usunięty."
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:161
 msgid ""
@@ -1140,13 +1342,6 @@ msgstr ""
 "zainstalowana. Jednakże można to zmienić, używając takich samych opcji, jak "
 "te dla polecenia <option>install</option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
-msgid "options"
-msgstr "opcje"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:262
 msgid ""
@@ -1162,8 +1357,8 @@ msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
-"Nie bierze pod uwagę sugerowanych pakietów jako zależności do instalacji. "
-"Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Suggests</literal>."
+"Uznaje sugerowane pakiety za zależności do instalacji. Pozycja w pliku "
+"konfiguracyjnym: <literal>APT::Install-Suggests</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1367,13 +1562,21 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:370
+#, fuzzy
+#| msgid ""
+#| "This option controls the architecture packages are built for by "
+#| "<command>apt-get source --compile</command> and how cross-"
+#| "builddependencies are satisfied. By default is it not set which means "
+#| "that the host architecture is the same as the build architecture (which "
+#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
+#| "<literal>APT::Get::Host-Architecture</literal>"
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
 "is the same as the build architecture (which is defined by <literal>APT::"
 "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>"
+"Architecture</literal>."
 msgstr ""
 "Za pomocą tej opcji można określić architekturę pakietów budowanych przez "
 "<command>apt-get source --compile</command> i sposób, w jaki są spełniane "
@@ -1383,9 +1586,34 @@ msgstr ""
 "Architecture</literal>). Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
 "Host-Architecture</literal>."
 
-#
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:380
+#, fuzzy
+#| msgid ""
+#| "This option controls the architecture packages are built for by "
+#| "<command>apt-get source --compile</command> and how cross-"
+#| "builddependencies are satisfied. By default is it not set which means "
+#| "that the host architecture is the same as the build architecture (which "
+#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
+#| "<literal>APT::Get::Host-Architecture</literal>"
+msgid ""
+"This option controls the activated build profiles for which a source package "
+"is built by <command>apt-get source --compile</command> and how build "
+"dependencies are satisfied. By default no build profile is active.  More "
+"than one build profile can be activated at a time by concatenating them with "
+"a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
+msgstr ""
+"Za pomocą tej opcji można określić architekturę pakietów budowanych przez "
+"<command>apt-get source --compile</command> i sposób, w jaki są spełniane "
+"międzyarchitekturowe zależności czasu budowania. Domyślnie nie jest "
+"ustawiona, co oznacza, że architektura budowanych pakietów jest taka sama "
+"jak architektura bieżącego komputera (definiowana przez <literal>APT::"
+"Architecture</literal>). Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
+"Host-Architecture</literal>."
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:391
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1395,7 +1623,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:396
 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -1409,7 +1637,7 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:403
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1422,7 +1650,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:404
+#: apt-get.8.xml:415
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1435,7 +1663,7 @@ msgstr ""
 "<literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:411
+#: apt-get.8.xml:422
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1449,7 +1677,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:430
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -1466,7 +1694,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:438
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "
@@ -1489,7 +1717,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:449
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1504,7 +1732,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:446
+#: apt-get.8.xml:457
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1513,7 +1741,7 @@ msgstr ""
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:462
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1531,7 +1759,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:461
+#: apt-get.8.xml:472
 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -1555,7 +1783,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:476
+#: apt-get.8.xml:487
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1570,7 +1798,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:494
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1580,7 +1808,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:500
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1595,7 +1823,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:507
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1615,7 +1843,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:518
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1627,7 +1855,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:524
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1638,7 +1866,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:529
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1649,33 +1877,24 @@ msgstr ""
 "w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:535
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1200 apt_preferences.5.xml:700
+#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
+#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "Pliki"
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
-#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
-#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
-msgid "See Also"
-msgstr "Zobacz także"
-
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:559
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1690,16 +1909,9 @@ msgstr ""
 "&apt-config;, &apt-secure;, Przewodnik APT dla użytkowników w &guidesdir;, "
 "&apt-preferences;, APT Howto."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
-msgid "Diagnostics"
-msgstr "Diagnostyka"
-
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:565
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -3519,7 +3731,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:182
+msgid ""
+"List of all build profiles enabled for build-dependency resolution, without "
+"the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
+"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
+"buildpackage; overrides the list notation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:190
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3528,14 +3749,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:187
+#: apt.conf.5.xml:196
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:201
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3544,7 +3765,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:209
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3559,7 +3780,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:221
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3576,7 +3797,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:234
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3587,7 +3808,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:245
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3600,7 +3821,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:248
+#: apt.conf.5.xml:257
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3620,38 +3841,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:273
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:268
+#: apt.conf.5.xml:277
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:282
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:278
+#: apt.conf.5.xml:287
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:293
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:294
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3659,7 +3880,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#: apt.conf.5.xml:301
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3672,7 +3893,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:314
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3684,7 +3905,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:317
+#: apt.conf.5.xml:326
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3696,7 +3917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:338
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3704,7 +3925,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:341
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3715,7 +3936,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:342
+#: apt.conf.5.xml:351
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3725,21 +3946,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:350
+#: apt.conf.5.xml:359
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:364
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:369
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3751,7 +3972,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:377
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3763,14 +3984,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:378 apt.conf.5.xml:466
+#: apt.conf.5.xml:387 apt.conf.5.xml:475
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:390
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3782,14 +4003,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:388
+#: apt.conf.5.xml:397
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:400
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -3799,7 +4020,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:398
+#: apt.conf.5.xml:407
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3807,7 +4028,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -3821,7 +4042,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:429
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3832,7 +4053,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:437
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3854,7 +4075,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:458
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -3873,7 +4094,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:478
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -3883,7 +4104,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:485
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -3892,7 +4113,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:490
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3902,13 +4123,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:499
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3921,20 +4142,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:512
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:523
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:518
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -3946,19 +4167,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:528
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:531
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:524
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -3976,13 +4197,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:538
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:533
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -3997,7 +4218,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:543
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4005,7 +4226,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:541
+#: apt.conf.5.xml:550
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4014,7 +4235,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:558
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4026,13 +4247,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:575
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:563
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4054,7 +4275,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:576
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4063,22 +4284,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:582
+#: apt.conf.5.xml:591
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:598
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:600
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4090,7 +4311,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:607
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4103,7 +4324,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:616
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4113,7 +4334,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:622
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4121,7 +4342,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:626
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4132,7 +4353,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:634
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4145,7 +4366,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:647
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4156,12 +4377,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:656
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:658
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4169,7 +4390,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:663
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4182,40 +4403,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:682
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:678
+#: apt.conf.5.xml:687
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:693
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:694
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:699
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4223,7 +4444,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:696
+#: apt.conf.5.xml:705
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4232,7 +4453,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:712
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4243,7 +4464,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:719
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4252,7 +4473,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:724
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4263,7 +4484,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:731
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4274,26 +4495,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:741
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:746
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:751
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:752
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4308,7 +4529,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:767
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4322,7 +4543,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:761
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4336,7 +4557,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:774
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4349,7 +4570,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:782
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4366,7 +4587,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:797
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4377,7 +4598,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:804
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4387,7 +4608,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:817
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4405,7 +4626,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:810
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4419,12 +4640,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:830
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:831
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4433,13 +4654,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:839
 #, fuzzy
 msgid "Debug options"
 msgstr "opcje"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:841
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4450,7 +4671,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:852
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4458,7 +4679,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:860
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4466,7 +4687,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:869
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4476,7 +4697,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:877
 #, fuzzy
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@ -4486,59 +4707,59 @@ msgstr ""
 "in CDROM IDs."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:887
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:896
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:907
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:918
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:929
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:940
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:951
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:961
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:971
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:981
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4546,53 +4767,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:992
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1004
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1014
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1024
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1036
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1047
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1049
+#: apt.conf.5.xml:1058
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1059
+#: apt.conf.5.xml:1068
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -4602,7 +4823,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1082
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -4620,46 +4841,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1094
+#: apt.conf.5.xml:1103
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1114
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1125
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1137
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1139
+#: apt.conf.5.xml:1148
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1149
+#: apt.conf.5.xml:1158
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1160
+#: apt.conf.5.xml:1169
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -4667,20 +4888,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1172
+#: apt.conf.5.xml:1181
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:1191
+msgid ""
+"Display the external commands that are called by apt hooks.  This includes e."
+"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Przykłady"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1195
+#: apt.conf.5.xml:1216
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -4688,7 +4917,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1207
+#: apt.conf.5.xml:1228
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -6692,14 +6921,14 @@ msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
-"filenames of the form <filename>package.template.XXXX</filename> and "
-"<filename>package.config.XXXX</filename>"
+"filenames of the form <filename>package.template.XXXXXX</filename> and "
+"<filename>package.config.XXXXXX</filename>"
 msgstr ""
 "plik-template i skrypt-config są zapisywane w katalogu tymczasowym podanym "
 "jako argument opcji <option>-t</option> lub <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>). Nazwy tych plików są w "
-"postaci <filename>pakiet.template.XXXX</filename> oraz <filename>pakiet."
-"config.XXXX</filename>."
+"postaci <filename>pakiet.template.XXXXXX</filename> oraz <filename>pakiet."
+"config.XXXXXX</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:60
@@ -7534,134 +7763,6 @@ msgstr ""
 "<command>apt-ftparchive</command> zwraca zero, gdy zakończyło się pomyślnie, "
 "100 - w przypadku błędu."
 
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "apt"
-msgstr "apt"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "16 June 1998"
-msgstr "16 czerwca 1998"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "Debian"
-msgstr "Debian"
-
-#. type: SH
-#: apt.8:18
-#, no-wrap
-msgid "NAME"
-msgstr "NAZWA"
-
-#
-#. type: Plain text
-#: apt.8:20
-msgid "apt - Advanced Package Tool"
-msgstr "apt - Zaawansowane narzędzie zarządzania pakietami"
-
-#. type: SH
-#: apt.8:20
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr "SKŁADNIA"
-
-#
-#. type: Plain text
-#: apt.8:22
-msgid "B<apt>"
-msgstr "B<apt>"
-
-#. type: SH
-#: apt.8:22
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr "OPIS"
-
-#. type: Plain text
-#: apt.8:31
-msgid ""
-"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-"System. Some options are only implemented in B<apt-get>(8)  though."
-msgstr ""
-"APT jest systemem zarządzania pakietami oprogramowania. Jest kilka nakładek "
-"przydatnych do codziennego zarządzania pakietami, takich jak B<aptitude>(8), "
-"działające w linii poleceń, lub B<synaptic>(8), wymagający środowiska X "
-"Window. Niemniej jednak niektóre opcje są dostępne tylko w B<apt-get>(8)."
-
-#. type: SH
-#: apt.8:31
-#, no-wrap
-msgid "SEE ALSO"
-msgstr "ZOBACZ TAKŻE"
-
-#
-#. type: Plain text
-#: apt.8:38
-msgid ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-msgstr ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-
-#. type: SH
-#: apt.8:38
-#, no-wrap
-msgid "DIAGNOSTICS"
-msgstr "DIAGNOSTYKA"
-
-#
-#. type: Plain text
-#: apt.8:40
-msgid "apt returns zero on normal operation, decimal 100 on error."
-msgstr ""
-"apt zwraca zero, jeżeli zakończyło się pomyślnie, 100 dziesiętnie w "
-"przypadku błędu."
-
-#. type: SH
-#: apt.8:40
-#, no-wrap
-msgid "BUGS"
-msgstr "BŁĘDY"
-
-#
-#. type: Plain text
-#: apt.8:42
-msgid "This manpage isn't even started."
-msgstr "Ta strona podręcznika nie jest nawet zaczęta."
-
-#
-#. type: Plain text
-#: apt.8:51
-msgid ""
-"See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-"B<reportbug>(1)  command."
-msgstr ""
-"Patrz E<lt>http://bugs.debian.org/aptE<gt>.  Aby wysłać zgłoszenie o błędzie "
-"w programie B<apt>, przeczytaj I</usr/share/doc/debian/bug-reporting.txt> "
-"lub użyj polecenia B<reportbug>(1)."
-
-#. type: SH
-#: apt.8:51
-#, no-wrap
-msgid "AUTHOR"
-msgstr "AUTOR"
-
-#
-#. type: Plain text
-#: apt.8:52
-msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-msgstr ""
-"apt zostało napisane przez zespół APT E<lt>apt@packages.debian.orgE<gt>."
-
 #. type: <title></title>
 #: guide.sgml:4
 msgid "APT User's Guide"
@@ -9216,6 +9317,99 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
+#~ msgid "apt"
+#~ msgstr "apt"
+
+#~ msgid "16 June 1998"
+#~ msgstr "16 czerwca 1998"
+
+#~ msgid "Debian"
+#~ msgstr "Debian"
+
+#~ msgid "NAME"
+#~ msgstr "NAZWA"
+
+#
+#~ msgid "apt - Advanced Package Tool"
+#~ msgstr "apt - Zaawansowane narzędzie zarządzania pakietami"
+
+#~ msgid "SYNOPSIS"
+#~ msgstr "SKŁADNIA"
+
+#
+#~ msgid "B<apt>"
+#~ msgstr "B<apt>"
+
+#~ msgid "DESCRIPTION"
+#~ msgstr "OPIS"
+
+#, fuzzy
+#~| msgid ""
+#~| "APT is a management system for software packages. For normal day to day "
+#~| "package management there are several frontends available, such as "
+#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+#~| "System. Some options are only implemented in B<apt-get>(8)  though."
+#~ msgid ""
+#~ "For normal day to day package management there are several frontends "
+#~ "available, such as B<aptitude>(8)  for the command line or "
+#~ "B<synaptic>(8)  for the X Window System. Some options are only "
+#~ "implemented in B<apt-get>(8)  though."
+#~ msgstr ""
+#~ "APT jest systemem zarządzania pakietami oprogramowania. Jest kilka "
+#~ "nakładek przydatnych do codziennego zarządzania pakietami, takich jak "
+#~ "B<aptitude>(8), działające w linii poleceń, lub B<synaptic>(8), "
+#~ "wymagający środowiska X Window. Niemniej jednak niektóre opcje są "
+#~ "dostępne tylko w B<apt-get>(8)."
+
+#~ msgid "SEE ALSO"
+#~ msgstr "ZOBACZ TAKŻE"
+
+#
+#, fuzzy
+#~| msgid ""
+#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~| "B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgid ""
+#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
+#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgstr ""
+#~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~ "B<apt_preferences>(5), B<apt-secure>(8)"
+
+#~ msgid "DIAGNOSTICS"
+#~ msgstr "DIAGNOSTYKA"
+
+#
+#~ msgid "apt returns zero on normal operation, decimal 100 on error."
+#~ msgstr ""
+#~ "apt zwraca zero, jeżeli zakończyło się pomyślnie, 100 dziesiętnie w "
+#~ "przypadku błędu."
+
+#~ msgid "BUGS"
+#~ msgstr "BŁĘDY"
+
+#
+#~ msgid "This manpage isn't even started."
+#~ msgstr "Ta strona podręcznika nie jest nawet zaczęta."
+
+#
+#~ msgid ""
+#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
+#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "B<reportbug>(1)  command."
+#~ msgstr ""
+#~ "Patrz E<lt>http://bugs.debian.org/aptE<gt>.  Aby wysłać zgłoszenie o "
+#~ "błędzie w programie B<apt>, przeczytaj I</usr/share/doc/debian/bug-"
+#~ "reporting.txt> lub użyj polecenia B<reportbug>(1)."
+
+#~ msgid "AUTHOR"
+#~ msgstr "AUTOR"
+
+#
+#~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
+#~ msgstr ""
+#~ "apt zostało napisane przez zespół APT E<lt>apt@packages.debian.orgE<gt>."
+
 #~ msgid "Package resource list for APT"
 #~ msgstr "Lista zasobów pakietów dla APT"
 
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 99adcbaff..6ebf93bc7 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
-"PO-Revision-Date: 2012-09-03 01:53+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"PO-Revision-Date: 2014-04-01 13:59+0200\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <l10n@debianpt.org>\n"
 "Language: pt\n"
@@ -660,35 +660,266 @@ msgstr ""
 "export 473041FA --> <!ENTITY synopsis-keyid \"id_de_chave\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27 apt-mark.8.xml:28
-#: apt-secure.8.xml:27 apt-cdrom.8.xml:27 apt-config.8.xml:28
+#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
+#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
+#: apt-config.8.xml:28
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28 apt-mark.8.xml:29
-#: apt-secure.8.xml:28 apt-cdrom.8.xml:28 apt-config.8.xml:29
-#: apt.conf.5.xml:34 apt_preferences.5.xml:28 sources.list.5.xml:29
-#: apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29 apt-ftparchive.1.xml:29
+#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
+#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
+#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
+#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
+#: apt-ftparchive.1.xml:29
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
-msgid "APT package handling utility -- command-line interface"
+#: apt.8.xml:32
+msgid "command-line interface"
 msgstr ""
-"Utilitário de manuseamento de pacotes do APT -- interface de linha de "
-"comandos"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 apt-mark.8.xml:40
-#: apt-secure.8.xml:52 apt-cdrom.8.xml:39 apt-config.8.xml:40
-#: apt.conf.5.xml:43 apt_preferences.5.xml:38 sources.list.5.xml:38
-#: apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40 apt-ftparchive.1.xml:40
+#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
+#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
+#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
+#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
+#: apt-ftparchive.1.xml:40
 msgid "Description"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:38
+msgid ""
+"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
+"handling packages. It provides a commandline interface for the package "
+"management of the system.  See also &apt-get; and &apt-cache; for more low-"
+"level command options."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:47
+msgid ""
+"<literal>list</literal> is used to display a list of packages. It supports "
+"shell pattern for matching package names and the following options: "
+"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"versions</option> are supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:58
+msgid ""
+"<literal>search</literal> searches for the given term(s) and display "
+"matching packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:64
+#, fuzzy
+#| msgid ""
+#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
+#| "package has."
+msgid ""
+"<literal>show</literal> shows the package information for the given "
+"package(s)."
+msgstr ""
+"<literal>rdepends</literal> mostra uma listagem de cada dependência reversa "
+"que um pacote tem."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:71
+msgid ""
+"<literal>install</literal> is followed by one or more package names desired "
+"for installation or upgrading."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:75 apt-get.8.xml:118
+msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"Pode ser seleccionada para instalação uma versão específica de um pacote ao "
+"continuar o nome do pacote com um igual (=) e a versão do pacote a "
+"seleccionar. Isto irá fazer com que essa versão seja localizada e "
+"seleccionada para instalação. Alternativamente pode ser seleccionada uma "
+"distribuição específica ao continuar o nome do pacote com uma slash (/) e a "
+"versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:85 apt-get.8.xml:153
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> é idêntico a <literal>install</literal>  à "
+"excepção que os pacotes são removidos em vez de instalados. Note que remover "
+"um pacote deixa os seus ficheiros de configuração no sistema. Se um sinal "
+"mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o "
+"pacote identificado será instalado em vez de removido."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:93
+msgid ""
+"<literal>edit-sources</literal> lets you edit your sources.list file and "
+"provides basic sanity checks."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:99
+#, fuzzy
+#| msgid ""
+#| "<literal>showhold</literal> is used to print a list of packages on hold "
+#| "in the same way as for the other show commands."
+msgid ""
+"<literal>update</literal> is used to resynchronize the package index files "
+"from their sources."
+msgstr ""
+"<literal>showhold</literal> é usado para escrever uma lista dos pacotes em "
+"retenção do mesmo modo que os outros comandos show."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:105
+msgid ""
+"<literal>upgrade</literal> is used to install the newest versions of all "
+"packages currently installed on the system from the sources enumerated in "
+"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
+"but existing package will never removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:114
+msgid ""
+"<literal>full-upgrade</literal> performs the function of upgrade but may "
+"also remove installed packages if that is required in order to resolve a "
+"package conflict."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
+#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
+#: apt-ftparchive.1.xml:506
+msgid "options"
+msgstr "opções"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:134
+msgid "Script usage"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:136
+msgid ""
+"The &apt; commandline is designed as a end-user tool and it may change the "
+"output between versions. While it tries to not break backward compatibility "
+"there is no guarantee for it either.  All features of &apt; are available in "
+"&apt-cache; and &apt-get; via APT options. Please prefer using these "
+"commands in your scripts."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:144
+msgid "Differences to &apt-get;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:145
+msgid ""
+"The <command>apt</command> command is meant to be pleasant for end users and "
+"does not need to be backward compatible like &apt-get;. Therefore some "
+"options are different:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:151
+#, fuzzy
+#| msgid "the <literal>Package:</literal> line"
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgstr "a linha <literal>Package:</literal>"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:155
+#, fuzzy
+#| msgid "the <literal>Component:</literal> line"
+msgid "The option <literal>APT::Color</literal> is enabled."
+msgstr "a linha <literal>Component:</literal>"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:159
+msgid ""
+"A new <literal>list</literal> command is available similar to <literal>dpkg "
+"--list</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:164
+#, fuzzy
+#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+msgid ""
+"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
+"enabled by default."
+msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
+#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
+#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
+#: apt-ftparchive.1.xml:609
+msgid "See Also"
+msgstr "Veja também"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:175
+#, fuzzy
+#| msgid ""
+#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
+#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
+#| "preferences;, the APT Howto."
+msgid ""
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
+"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
+msgstr ""
+"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
+"&apt-config;, &apt-secure;, O guia de utilizadores do The APT em "
+"&guidesdir;, &apt-preferences;, o Howto do APT."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
+#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
+#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+msgid "Diagnostics"
+msgstr "Diagnóstico"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:181
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
+#| "on error."
+msgid ""
+"<command>apt</command> returns zero on normal operation, decimal 100 on "
+"error."
+msgstr ""
+"<command>apt-get</command> devolve zero na operação normal, 100 decimal em "
+"erro."
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-get.8.xml:35
+msgid "APT package handling utility -- command-line interface"
+msgstr ""
+"Utilitário de manuseamento de pacotes do APT -- interface de linha de "
+"comandos"
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:41
 #, fuzzy
 #| msgid ""
@@ -839,23 +1070,6 @@ msgstr ""
 "de resolução de conflitos do apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:118
-msgid ""
-"A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
-msgstr ""
-"Pode ser seleccionada para instalação uma versão específica de um pacote ao "
-"continuar o nome do pacote com um igual (=) e a versão do pacote a "
-"seleccionar. Isto irá fazer com que essa versão seja localizada e "
-"seleccionada para instalação. Alternativamente pode ser seleccionada uma "
-"distribuição específica ao continuar o nome do pacote com uma slash (/) e a "
-"versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:125
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
@@ -913,21 +1127,6 @@ msgstr ""
 "caractere '^' ou '$', para criar uma expressão regular mais específica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:153
-msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"<literal>remove</literal> é idêntico a <literal>install</literal>  à "
-"excepção que os pacotes são removidos em vez de instalados. Note que remover "
-"um pacote deixa os seus ficheiros de configuração no sistema. Se um sinal "
-"mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o "
-"pacote identificado será instalado em vez de removido."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:161
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
@@ -1124,13 +1323,6 @@ msgstr ""
 "está instalada. No entanto, você pode especificar as mesmas opções que são "
 "para o comando <option>install</option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
-msgid "options"
-msgstr "opções"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:262
 msgid ""
@@ -1341,13 +1533,21 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:370
+#, fuzzy
+#| msgid ""
+#| "This option controls the architecture packages are built for by "
+#| "<command>apt-get source --compile</command> and how cross-"
+#| "builddependencies are satisfied. By default is it not set which means "
+#| "that the host architecture is the same as the build architecture (which "
+#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
+#| "<literal>APT::Get::Host-Architecture</literal>"
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
 "is the same as the build architecture (which is defined by <literal>APT::"
 "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>"
+"Architecture</literal>."
 msgstr ""
 "Esta opção controla a arquitectura para que os pacotes são compilados pelo "
 "<command>apt-get source --compile</command> e como as dependências cruzadas "
@@ -1358,6 +1558,30 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:380
+#, fuzzy
+#| msgid ""
+#| "This option controls the architecture packages are built for by "
+#| "<command>apt-get source --compile</command> and how cross-"
+#| "builddependencies are satisfied. By default is it not set which means "
+#| "that the host architecture is the same as the build architecture (which "
+#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
+#| "<literal>APT::Get::Host-Architecture</literal>"
+msgid ""
+"This option controls the activated build profiles for which a source package "
+"is built by <command>apt-get source --compile</command> and how build "
+"dependencies are satisfied. By default no build profile is active.  More "
+"than one build profile can be activated at a time by concatenating them with "
+"a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
+msgstr ""
+"Esta opção controla a arquitectura para que os pacotes são compilados pelo "
+"<command>apt-get source --compile</command> e como as dependências cruzadas "
+"de compilação são satisfeitas. Por predefinição não está activa o que "
+"significa que a arquitectura anfitriã é a mesma que a arquitectura de "
+"compilação (a qual é definida por <literal>APT::Architecture</literal>).  "
+"item de Configuração: <literal>APT::Get::Host-Architecture</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:391
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1366,7 +1590,7 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:396
 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -1379,7 +1603,7 @@ msgstr ""
 "Item de Configuração: <literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:403
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1391,7 +1615,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:404
+#: apt-get.8.xml:415
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1404,7 +1628,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:411
+#: apt-get.8.xml:422
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1417,7 +1641,7 @@ msgstr ""
 "Item de Configuração: <literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:430
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -1432,7 +1656,7 @@ msgstr ""
 "<literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:438
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "
@@ -1453,7 +1677,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:449
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1466,7 +1690,7 @@ msgstr ""
 "option>. Item de Configuração: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:446
+#: apt-get.8.xml:457
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1475,7 +1699,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:462
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1492,7 +1716,7 @@ msgstr ""
 "fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:461
+#: apt-get.8.xml:472
 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -1515,7 +1739,7 @@ msgstr ""
 "Release</literal>; veja também o manual &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:476
+#: apt-get.8.xml:487
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1529,7 +1753,7 @@ msgstr ""
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:494
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1539,7 +1763,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:500
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1552,7 +1776,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:507
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1571,7 +1795,7 @@ msgstr ""
 "<literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:518
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1582,7 +1806,7 @@ msgstr ""
 "Only</literal>, e <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:524
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1591,7 +1815,7 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:529
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1602,32 +1826,23 @@ msgstr ""
 "Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:535
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1200 apt_preferences.5.xml:700
+#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
+#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
 msgid "Files"
 msgstr "Ficheiros"
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
-#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
-#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
-msgid "See Also"
-msgstr "Veja também"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:559
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1642,15 +1857,8 @@ msgstr ""
 "&apt-config;, &apt-secure;, O guia de utilizadores do The APT em "
 "&guidesdir;, &apt-preferences;, o Howto do APT."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
-msgid "Diagnostics"
-msgstr "Diagnóstico"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:565
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -3491,7 +3699,16 @@ msgstr ""
 "<command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:182
+msgid ""
+"List of all build profiles enabled for build-dependency resolution, without "
+"the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
+"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
+"buildpackage; overrides the list notation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:190
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3504,7 +3721,7 @@ msgstr ""
 "'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:187
+#: apt.conf.5.xml:196
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3513,7 +3730,7 @@ msgstr ""
 "os pacotes segurados sejam ignorados na sua decisão de marcação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:201
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3527,7 +3744,7 @@ msgstr ""
 "directo de os reinstalar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:209
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3554,7 +3771,7 @@ msgstr ""
 "de A não está mais satisfeita."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:221
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3583,7 +3800,7 @@ msgstr ""
 "que pode ajudar a prevenir."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:234
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3600,7 +3817,7 @@ msgstr ""
 "eles possa trabalhar em melhorar ou corrigir o processo de actualização."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:245
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3621,7 +3838,7 @@ msgstr ""
 "command> ou nada de que esses pacotes dependam."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:248
+#: apt.conf.5.xml:257
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3658,13 +3875,13 @@ msgstr ""
 "da cache é desactivado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:273
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Define quais pacotes são considerados dependências essenciais de compilação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:268
+#: apt.conf.5.xml:277
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3673,7 +3890,7 @@ msgstr ""
 "documentação para mais informação acerca das opções daqui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:282
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3682,7 +3899,7 @@ msgstr ""
 "documentação para mais informação acerca das opções daqui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:278
+#: apt.conf.5.xml:287
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3691,12 +3908,12 @@ msgstr ""
 "documentação para mais informação acerca das opções de aqui."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:293
 msgid "The Acquire Group"
 msgstr "O Grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:294
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3707,7 +3924,7 @@ msgstr ""
 "descarga (veja também &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#: apt.conf.5.xml:301
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3729,7 +3946,7 @@ msgstr ""
 "seguinte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:314
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3749,7 +3966,7 @@ msgstr ""
 "nome da opção."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:317
+#: apt.conf.5.xml:326
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3769,7 +3986,7 @@ msgstr ""
 "arquivo ao nome da opção."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:338
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3780,7 +3997,7 @@ msgstr ""
 "por inteiro. Verdadeiro por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:341
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3798,7 +4015,7 @@ msgstr ""
 "completo em vez das patches."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:342
+#: apt.conf.5.xml:351
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3813,7 +4030,7 @@ msgstr ""
 "aberta uma ligação por tipo de URI."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:350
+#: apt.conf.5.xml:359
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3822,7 +4039,7 @@ msgstr ""
 "tentar, no número fornecido de vezes, obter ficheiros falhados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:364
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3832,7 +4049,7 @@ msgstr ""
 "A predefinição é verdadeiro."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:369
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3851,7 +4068,7 @@ msgstr ""
 "variável de ambiente <envar>http_proxy</envar>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:377
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3871,7 +4088,7 @@ msgstr ""
 "(grandes) ficheiros .deb."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:378 apt.conf.5.xml:466
+#: apt.conf.5.xml:387 apt.conf.5.xml:475
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3881,7 +4098,7 @@ msgstr ""
 "dados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:390
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3900,7 +4117,7 @@ msgstr ""
 "web e proxies que escolheram não respeitar a especificação HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:388
+#: apt.conf.5.xml:397
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3909,7 +4126,7 @@ msgstr ""
 "os redireccionamentos, o que está activo por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:400
 #, fuzzy
 #| msgid ""
 #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
@@ -3931,7 +4148,7 @@ msgstr ""
 "de múltiplos servidores ao mesmo tempo.)"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:398
+#: apt.conf.5.xml:407
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3943,7 +4160,7 @@ msgstr ""
 "identificador conhecido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -3957,7 +4174,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:429
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3974,7 +4191,7 @@ msgstr ""
 "literal> ainda não é suportada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:437
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4013,7 +4230,7 @@ msgstr ""
 "host&gt;::SslForceVersion</literal> é a opção 'por máquina' correspondente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:458
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4047,7 +4264,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:478
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -4063,7 +4280,7 @@ msgstr ""
 "específica (veja a amostra de ficheiro de configuração para exemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:485
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4077,7 +4294,7 @@ msgstr ""
 "eficiência."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:490
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4092,13 +4309,13 @@ msgstr ""
 "ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:499
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4119,7 +4336,7 @@ msgstr ""
 "barra final. Comandos para desmontar podem ser especificados usando o UMount."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:512
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4128,13 +4345,13 @@ msgstr ""
 "literal>, a qual passa parâmetros adicionais ao gpgv."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:523
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:518
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4153,19 +4370,19 @@ msgstr ""
 "alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:528
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:531
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:524
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4197,13 +4414,13 @@ msgstr ""
 "automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:538
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:533
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4229,7 +4446,7 @@ msgstr ""
 "prefixar a lista com este tipo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:543
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4241,7 +4458,7 @@ msgstr ""
 "maioritariamente apenas para mirrors locais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:541
+#: apt.conf.5.xml:550
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4254,7 +4471,7 @@ msgstr ""
 "CPU quando constrói as caches de pacotes locais. Falso por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:558
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4274,13 +4491,13 @@ msgstr ""
 "especialmenteraros."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:575
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:563
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4319,7 +4536,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:576
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4333,22 +4550,22 @@ msgstr ""
 "literal>\" implícito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:582
+#: apt.conf.5.xml:591
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:598
 msgid "Directories"
 msgstr "Directórios"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:600
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4367,7 +4584,7 @@ msgstr ""
 "items que não começam com <filename>/</filename> ou <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:607
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4389,7 +4606,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:616
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4404,7 +4621,7 @@ msgstr ""
 "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:622
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4415,7 +4632,7 @@ msgstr ""
 "estar feito então é carregado o ficheiro de configuração principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:626
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4433,7 +4650,7 @@ msgstr ""
 "respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:634
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4454,7 +4671,7 @@ msgstr ""
 "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:647
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4472,12 +4689,12 @@ msgstr ""
 "expressão regular."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:656
 msgid "APT in DSelect"
 msgstr "APT em DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:658
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4488,7 +4705,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:663
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4510,7 +4727,7 @@ msgstr ""
 "pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4519,7 +4736,7 @@ msgstr ""
 "comandos quando é corrido para a fase de instalação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:682
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4528,7 +4745,7 @@ msgstr ""
 "comandos quando é executado para a fase de actualização."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:678
+#: apt.conf.5.xml:687
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4537,12 +4754,12 @@ msgstr ""
 "continuar. A predefinição é avisar apenas em caso de erro."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:693
 msgid "How APT calls &dpkg;"
 msgstr "Como o APT chama o &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:694
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4551,7 +4768,7 @@ msgstr ""
 "&dpkg;. Estas estão na secção <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:699
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4562,7 +4779,7 @@ msgstr ""
 "um argumento único ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:696
+#: apt.conf.5.xml:705
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4575,7 +4792,7 @@ msgstr ""
 "bin/sh</filename>, caso algum deles falhe, o APT irá abortar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:712
 #, fuzzy
 #| msgid ""
 #| "This is a list of shell commands to run before invoking &dpkg;. Like "
@@ -4599,7 +4816,7 @@ msgstr ""
 "instalar, um por cada linha na entrada standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:719
 #, fuzzy
 #| msgid ""
 #| "Version 2 of this protocol dumps more information, including the protocol "
@@ -4620,7 +4837,7 @@ msgstr ""
 "dado ao <literal>Pre-Install-Pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:724
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4631,7 +4848,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:731
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4642,7 +4859,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:741
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4651,7 +4868,7 @@ msgstr ""
 "predefinição é <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:746
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4660,12 +4877,12 @@ msgstr ""
 "predefinição é desactivar a assinatura e produzir todos os binários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:751
 msgid "dpkg trigger usage (and related options)"
 msgstr "Utilização trigger do dpkg (e opções relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:752
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4691,7 +4908,7 @@ msgstr ""
 "100% enquanto na realidade está a configurar todos os pacotes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:767
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4705,7 +4922,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:761
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4729,7 +4946,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:774
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4751,7 +4968,7 @@ msgstr ""
 "chamadas unpack e remove."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:782
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4781,7 +4998,7 @@ msgstr ""
 "arrancar."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:797
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4799,7 +5016,7 @@ msgstr ""
 "esta opção em todas excepto na última execução."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:804
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4815,7 +5032,7 @@ msgstr ""
 "configurar este pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:817
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4833,7 +5050,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:810
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4857,12 +5074,12 @@ msgstr ""
 "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:830
 msgid "Periodic and Archives options"
 msgstr "Opções Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:831
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4875,12 +5092,12 @@ msgstr ""
 "Veja o cabeçalho deste script para uma breve documentação das suas opções."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:839
 msgid "Debug options"
 msgstr "Opções de depuração"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:841
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4897,7 +5114,7 @@ msgstr ""
 "interesse para o utilizador normal, mas algumas podem ter:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:852
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4908,7 +5125,7 @@ msgstr ""
 "remove, purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:860
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4919,7 +5136,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como um utilizador não root."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:869
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4931,7 +5148,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:877
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4940,12 +5157,12 @@ msgstr ""
 "IDs de CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:887
 msgid "A full list of debugging options to apt follows."
 msgstr "Segue-se uma lista completa de opções de depuração para o apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:896
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -4953,25 +5170,25 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:907
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:918
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:929
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:940
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -4980,7 +5197,7 @@ msgstr ""
 "criptográficas usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:951
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -4989,13 +5206,13 @@ msgstr ""
 "armazenados em CD-ROMs."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:961
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Descreve os processos de resolver dependências de compilação no &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:971
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5004,7 +5221,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:981
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5015,7 +5232,7 @@ msgstr ""
 "para um CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:992
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5025,14 +5242,14 @@ msgstr ""
 "literal></quote> ao mesmo tempo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1004
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Regista no log quando os items são adicionados ou removidos da fila de "
 "download global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1014
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5041,7 +5258,7 @@ msgstr ""
 "checksums e assinaturas criptográficas dos ficheiros descarregados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1024
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5051,7 +5268,7 @@ msgstr ""
 "pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1036
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5060,7 +5277,7 @@ msgstr ""
 "do apt quando se descarrega diffs de índice em vez de índices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1047
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5068,7 +5285,7 @@ msgstr ""
 "downloads."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1049
+#: apt.conf.5.xml:1058
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5077,7 +5294,7 @@ msgstr ""
 "de pacotes e com a remoção de pacotes não utilizados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1059
+#: apt.conf.5.xml:1068
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5092,7 +5309,7 @@ msgstr ""
 "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1082
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5123,7 +5340,7 @@ msgstr ""
 "pacote aparece."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1094
+#: apt.conf.5.xml:1103
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5133,7 +5350,7 @@ msgstr ""
 "único."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1114
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5142,7 +5359,7 @@ msgstr ""
 "estado e quaisquer erros encontrados enquanto os analisa."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1125
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5151,7 +5368,7 @@ msgstr ""
 "literal> deve passar os pacotes ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1137
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5159,12 +5376,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1139
+#: apt.conf.5.xml:1148
 msgid "Output the priority of each package list on startup."
 msgstr "Escreve a prioridade da cada lista de pacote no arranque."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1149
+#: apt.conf.5.xml:1158
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5173,7 +5390,7 @@ msgstr ""
 "acontece quando é encontrado um problema de dependências complexo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1160
+#: apt.conf.5.xml:1169
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5184,7 +5401,7 @@ msgstr ""
 "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1172
+#: apt.conf.5.xml:1181
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5192,14 +5409,22 @@ msgstr ""
 "Escreve informação acerca dos fornecedores lida de <filename>/etc/apt/"
 "vendors.list</filename>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:1191
+msgid ""
+"Display the external commands that are called by apt hooks.  This includes e."
+"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1195
+#: apt.conf.5.xml:1216
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5209,7 +5434,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1207
+#: apt.conf.5.xml:1228
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -7213,14 +7438,14 @@ msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
-"filenames of the form <filename>package.template.XXXX</filename> and "
-"<filename>package.config.XXXX</filename>"
+"filenames of the form <filename>package.template.XXXXXX</filename> and "
+"<filename>package.config.XXXXXX</filename>"
 msgstr ""
 "ficheiro-modelo e script-de-configuração são escritos num directório "
 "temporário especificado por <option>-t</option> ou <option>--tempdir</"
 "option> (<literal>APT::ExtractTemplates::TempDir</literal>) directório, com "
-"nomes de ficheiros no formato <filename>pacote.modelo.XXXX</filename> e "
-"<filename>pacote.configuração.XXXX</filename>"
+"nomes de ficheiros no formato <filename>pacote.modelo.XXXXXX</filename> e "
+"<filename>pacote.configuração.XXXXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:60
@@ -8246,125 +8471,6 @@ msgstr ""
 "<command>apt-ftparchive</command> devolve zero na operação normal, 100 "
 "decimal em erro."
 
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "apt"
-msgstr "apt"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "16 June 1998"
-msgstr "16 Junho 1998"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "Debian"
-msgstr "Debian"
-
-#. type: SH
-#: apt.8:18
-#, no-wrap
-msgid "NAME"
-msgstr "NOME"
-
-#. type: Plain text
-#: apt.8:20
-msgid "apt - Advanced Package Tool"
-msgstr "apt - Ferramenta de Pacotes Avançada"
-
-#. type: SH
-#: apt.8:20
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr "SINOPSE"
-
-#. type: Plain text
-#: apt.8:22
-msgid "B<apt>"
-msgstr "B<apt>"
-
-#. type: SH
-#: apt.8:22
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr "DESCRIÇÃO"
-
-#. type: Plain text
-#: apt.8:31
-msgid ""
-"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-"System. Some options are only implemented in B<apt-get>(8)  though."
-msgstr ""
-"APT é um sistema de gestão para pacotes de software. Para a gestão de "
-"pacotes normal do dia-a-dia existem vários frontends disponíveis, como o "
-"B<aptitude>(8) para a linha de comandos ou o B<synaptic>(8) para o X Window "
-"System. No entanto, algumas das opções estão apenas implementadas no B<apt-"
-"get>(8)."
-
-#. type: SH
-#: apt.8:31
-#, no-wrap
-msgid "SEE ALSO"
-msgstr "VEJA TAMBÉM"
-
-#. type: Plain text
-#: apt.8:38
-msgid ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-msgstr ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-
-#. type: SH
-#: apt.8:38
-#, no-wrap
-msgid "DIAGNOSTICS"
-msgstr "DIAGNÓSTICOS"
-
-#. type: Plain text
-#: apt.8:40
-msgid "apt returns zero on normal operation, decimal 100 on error."
-msgstr "o apt devolve zero na operação normal, 100 decimal em erro."
-
-#. type: SH
-#: apt.8:40
-#, no-wrap
-msgid "BUGS"
-msgstr "BUGS"
-
-#. type: Plain text
-#: apt.8:42
-msgid "This manpage isn't even started."
-msgstr "Este manual ainda nem começou."
-
-#. type: Plain text
-#: apt.8:51
-msgid ""
-"See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-"B<reportbug>(1)  command."
-msgstr ""
-"Veja E<lt>http://bugs.debian.org/aptE<gt>.  Se deseja reportar um bug em "
-"B<apt>, por favor veja I</usr/share/doc/debian/bug-reporting.txt> ou o "
-"comando B<reportbug>(1) ."
-
-#. type: SH
-#: apt.8:51
-#, no-wrap
-msgid "AUTHOR"
-msgstr "AUTOR"
-
-#. type: Plain text
-#: apt.8:52
-msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-msgstr "apt foi escrito pelo APT team E<lt>apt@packages.debian.orgE<gt>."
-
 #. type: <title></title>
 #: guide.sgml:4
 msgid "APT User's Guide"
@@ -9907,6 +10013,89 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
+#~ msgid "apt"
+#~ msgstr "apt"
+
+#~ msgid "16 June 1998"
+#~ msgstr "16 Junho 1998"
+
+#~ msgid "Debian"
+#~ msgstr "Debian"
+
+#~ msgid "NAME"
+#~ msgstr "NOME"
+
+#~ msgid "apt - Advanced Package Tool"
+#~ msgstr "apt - Ferramenta de Pacotes Avançada"
+
+#~ msgid "SYNOPSIS"
+#~ msgstr "SINOPSE"
+
+#~ msgid "B<apt>"
+#~ msgstr "B<apt>"
+
+#~ msgid "DESCRIPTION"
+#~ msgstr "DESCRIÇÃO"
+
+#, fuzzy
+#~| msgid ""
+#~| "APT is a management system for software packages. For normal day to day "
+#~| "package management there are several frontends available, such as "
+#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+#~| "System. Some options are only implemented in B<apt-get>(8)  though."
+#~ msgid ""
+#~ "For normal day to day package management there are several frontends "
+#~ "available, such as B<aptitude>(8)  for the command line or "
+#~ "B<synaptic>(8)  for the X Window System. Some options are only "
+#~ "implemented in B<apt-get>(8)  though."
+#~ msgstr ""
+#~ "APT é um sistema de gestão para pacotes de software. Para a gestão de "
+#~ "pacotes normal do dia-a-dia existem vários frontends disponíveis, como o "
+#~ "B<aptitude>(8) para a linha de comandos ou o B<synaptic>(8) para o X "
+#~ "Window System. No entanto, algumas das opções estão apenas implementadas "
+#~ "no B<apt-get>(8)."
+
+#~ msgid "SEE ALSO"
+#~ msgstr "VEJA TAMBÉM"
+
+#, fuzzy
+#~| msgid ""
+#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~| "B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgid ""
+#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
+#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
+#~ msgstr ""
+#~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+#~ "B<apt_preferences>(5), B<apt-secure>(8)"
+
+#~ msgid "DIAGNOSTICS"
+#~ msgstr "DIAGNÓSTICOS"
+
+#~ msgid "apt returns zero on normal operation, decimal 100 on error."
+#~ msgstr "o apt devolve zero na operação normal, 100 decimal em erro."
+
+#~ msgid "BUGS"
+#~ msgstr "BUGS"
+
+#~ msgid "This manpage isn't even started."
+#~ msgstr "Este manual ainda nem começou."
+
+#~ msgid ""
+#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
+#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "B<reportbug>(1)  command."
+#~ msgstr ""
+#~ "Veja E<lt>http://bugs.debian.org/aptE<gt>.  Se deseja reportar um bug em "
+#~ "B<apt>, por favor veja I</usr/share/doc/debian/bug-reporting.txt> ou o "
+#~ "comando B<reportbug>(1) ."
+
+#~ msgid "AUTHOR"
+#~ msgstr "AUTOR"
+
+#~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
+#~ msgstr "apt foi escrito pelo APT team E<lt>apt@packages.debian.orgE<gt>."
+
 #~ msgid "Package resource list for APT"
 #~ msgstr "Lista de recursos de pacote para APT"
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index c1014fbb0..e9e785f08 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -480,34 +480,226 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27 apt-mark.8.xml:28
-#: apt-secure.8.xml:27 apt-cdrom.8.xml:27 apt-config.8.xml:28
+#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
+#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
+#: apt-config.8.xml:28
 msgid "8"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28 apt-mark.8.xml:29
-#: apt-secure.8.xml:28 apt-cdrom.8.xml:28 apt-config.8.xml:29
-#: apt.conf.5.xml:34 apt_preferences.5.xml:28 sources.list.5.xml:29
-#: apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29 apt-ftparchive.1.xml:29
+#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
+#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
+#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
+#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
+#: apt-ftparchive.1.xml:29
 msgid "APT"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
-msgid "APT package handling utility -- command-line interface"
+#: apt.8.xml:32
+msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 apt-mark.8.xml:40
-#: apt-secure.8.xml:52 apt-cdrom.8.xml:39 apt-config.8.xml:40
-#: apt.conf.5.xml:43 apt_preferences.5.xml:38 sources.list.5.xml:38
-#: apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40 apt-ftparchive.1.xml:40
+#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
+#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
+#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
+#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
+#: apt-ftparchive.1.xml:40
 #, fuzzy
 msgid "Description"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:38
+msgid ""
+"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
+"handling packages. It provides a commandline interface for the package "
+"management of the system.  See also &apt-get; and &apt-cache; for more low-"
+"level command options."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:47
+msgid ""
+"<literal>list</literal> is used to display a list of packages. It supports "
+"shell pattern for matching package names and the following options: "
+"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"versions</option> are supported."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:58
+msgid ""
+"<literal>search</literal> searches for the given term(s) and display "
+"matching packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:64
+msgid ""
+"<literal>show</literal> shows the package information for the given "
+"package(s)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:71
+msgid ""
+"<literal>install</literal> is followed by one or more package names desired "
+"for installation or upgrading."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:75 apt-get.8.xml:118
+msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:85 apt-get.8.xml:153
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:93
+msgid ""
+"<literal>edit-sources</literal> lets you edit your sources.list file and "
+"provides basic sanity checks."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:99
+msgid ""
+"<literal>update</literal> is used to resynchronize the package index files "
+"from their sources."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:105
+msgid ""
+"<literal>upgrade</literal> is used to install the newest versions of all "
+"packages currently installed on the system from the sources enumerated in "
+"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
+"but existing package will never removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:114
+msgid ""
+"<literal>full-upgrade</literal> performs the function of upgrade but may "
+"also remove installed packages if that is required in order to resolve a "
+"package conflict."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
+#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
+#: apt-ftparchive.1.xml:506
+msgid "options"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:134
+msgid "Script usage"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:136
+msgid ""
+"The &apt; commandline is designed as a end-user tool and it may change the "
+"output between versions. While it tries to not break backward compatibility "
+"there is no guarantee for it either.  All features of &apt; are available in "
+"&apt-cache; and &apt-get; via APT options. Please prefer using these "
+"commands in your scripts."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:144
+msgid "Differences to &apt-get;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:145
+msgid ""
+"The <command>apt</command> command is meant to be pleasant for end users and "
+"does not need to be backward compatible like &apt-get;. Therefore some "
+"options are different:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:151
+#, fuzzy
+msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgstr "a linha <literal>Package:</literal>"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:155
+#, fuzzy
+msgid "The option <literal>APT::Color</literal> is enabled."
+msgstr "a linha <literal>Component:</literal>"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:159
+msgid ""
+"A new <literal>list</literal> command is available similar to <literal>dpkg "
+"--list</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: apt.8.xml:164
+#, fuzzy
+msgid ""
+"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
+"enabled by default."
+msgstr "a linha <literal>Archive:</literal>"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
+#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
+#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
+#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
+#: apt-ftparchive.1.xml:609
+#, fuzzy
+msgid "See Also"
+msgstr "Consulte também"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:175
+msgid ""
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
+"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
+#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
+#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+msgid "Diagnostics"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml:181
+msgid ""
+"<command>apt</command> returns zero on normal operation, decimal 100 on "
+"error."
+msgstr ""
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-get.8.xml:35
+msgid "APT package handling utility -- command-line interface"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:41
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
@@ -597,17 +789,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:118
-msgid ""
-"A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:125
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
@@ -646,16 +827,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:153
-msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:161
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
@@ -780,13 +951,6 @@ msgid ""
 "<option>install</option> command."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
-msgid "options"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:262
 msgid ""
@@ -925,18 +1089,28 @@ msgid ""
 "satisfied. By default is it not set which means that the host architecture "
 "is the same as the build architecture (which is defined by <literal>APT::"
 "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>"
+"Architecture</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:380
 msgid ""
+"This option controls the activated build profiles for which a source package "
+"is built by <command>apt-get source --compile</command> and how build "
+"dependencies are satisfied. By default no build profile is active.  More "
+"than one build profile can be activated at a time by concatenating them with "
+"a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:391
+msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:396
 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -945,7 +1119,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:403
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -957,7 +1131,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:404
+#: apt-get.8.xml:415
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -966,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:411
+#: apt-get.8.xml:422
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -975,7 +1149,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:430
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -985,7 +1159,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:438
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "
@@ -998,7 +1172,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:449
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1007,14 +1181,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:446
+#: apt-get.8.xml:457
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:462
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1025,7 +1199,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:461
+#: apt-get.8.xml:472
 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -1039,7 +1213,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:476
+#: apt-get.8.xml:487
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1048,14 +1222,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:494
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:500
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1064,7 +1238,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:507
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1076,7 +1250,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:518
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1084,14 +1258,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:524
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:529
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1099,48 +1273,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:535
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1200 apt_preferences.5.xml:700
+#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
+#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
 msgid "Files"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
-#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
-#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
-#, fuzzy
-msgid "See Also"
-msgstr "Consulte também"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:559
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
 "APT Howto."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
-msgid "Diagnostics"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:565
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -2471,7 +2628,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:182
+msgid ""
+"List of all build profiles enabled for build-dependency resolution, without "
+"the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
+"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
+"buildpackage; overrides the list notation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:190
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -2480,14 +2646,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:187
+#: apt.conf.5.xml:196
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:201
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -2496,7 +2662,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:209
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -2511,7 +2677,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:221
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -2528,7 +2694,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:234
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -2539,7 +2705,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:245
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -2552,7 +2718,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:248
+#: apt.conf.5.xml:257
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -2572,38 +2738,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:273
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:268
+#: apt.conf.5.xml:277
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:282
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:278
+#: apt.conf.5.xml:287
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:293
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:294
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -2611,7 +2777,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#: apt.conf.5.xml:301
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -2624,7 +2790,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:314
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2636,7 +2802,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:317
+#: apt.conf.5.xml:326
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2648,7 +2814,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:338
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2656,7 +2822,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:341
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -2667,7 +2833,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:342
+#: apt.conf.5.xml:351
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -2677,21 +2843,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:350
+#: apt.conf.5.xml:359
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:364
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:369
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -2703,7 +2869,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:377
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -2715,14 +2881,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:378 apt.conf.5.xml:466
+#: apt.conf.5.xml:387 apt.conf.5.xml:475
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:390
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -2734,14 +2900,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:388
+#: apt.conf.5.xml:397
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:400
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -2751,7 +2917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:398
+#: apt.conf.5.xml:407
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -2759,7 +2925,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -2773,7 +2939,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:429
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2784,7 +2950,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:437
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2806,7 +2972,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:458
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -2825,7 +2991,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:478
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -2835,7 +3001,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:485
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -2844,7 +3010,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:490
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -2854,13 +3020,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:499
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -2873,20 +3039,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:512
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:523
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:518
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -2898,19 +3064,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:528
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:531
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:524
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -2928,13 +3094,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:538
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:533
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -2949,7 +3115,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:543
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -2957,7 +3123,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:541
+#: apt.conf.5.xml:550
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -2966,7 +3132,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:558
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -2978,13 +3144,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:575
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:563
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -3006,7 +3172,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:576
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -3015,22 +3181,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:582
+#: apt.conf.5.xml:591
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:598
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:600
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -3042,7 +3208,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:607
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -3055,7 +3221,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:616
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3065,7 +3231,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:622
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -3073,7 +3239,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:626
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -3084,7 +3250,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:634
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3097,7 +3263,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:647
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -3108,12 +3274,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:656
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:658
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3121,7 +3287,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:663
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -3134,40 +3300,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:682
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:678
+#: apt.conf.5.xml:687
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:693
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:694
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:699
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -3175,7 +3341,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:696
+#: apt.conf.5.xml:705
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3184,7 +3350,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:712
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3195,7 +3361,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:719
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3204,7 +3370,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:724
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -3215,7 +3381,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:731
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -3226,26 +3392,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:741
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:746
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:751
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:752
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3260,7 +3426,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:767
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3270,7 +3436,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:761
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -3284,7 +3450,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:774
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -3297,7 +3463,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:782
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -3314,7 +3480,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:797
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -3325,7 +3491,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:804
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -3335,7 +3501,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:817
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3347,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:810
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3361,12 +3527,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:830
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:831
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -3375,12 +3541,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:839
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:841
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3391,7 +3557,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:852
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -3399,7 +3565,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:860
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -3407,7 +3573,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:869
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3417,66 +3583,66 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:877
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:887
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:896
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:907
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:918
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:929
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:940
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:951
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:961
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:971
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:981
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -3484,53 +3650,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:992
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1004
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1014
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1024
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1036
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1047
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1049
+#: apt.conf.5.xml:1058
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1059
+#: apt.conf.5.xml:1068
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -3540,7 +3706,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1082
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -3558,46 +3724,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1094
+#: apt.conf.5.xml:1103
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1114
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1125
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1137
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1139
+#: apt.conf.5.xml:1148
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1149
+#: apt.conf.5.xml:1158
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1160
+#: apt.conf.5.xml:1169
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -3605,21 +3771,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1172
+#: apt.conf.5.xml:1181
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:1191
+msgid ""
+"Display the external commands that are called by apt hooks.  This includes e."
+"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
+#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
 #: apt-ftparchive.1.xml:598
 #, fuzzy
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1195
+#: apt.conf.5.xml:1216
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3627,7 +3801,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1207
+#: apt.conf.5.xml:1228
 #, fuzzy
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -5474,8 +5648,8 @@ msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
-"filenames of the form <filename>package.template.XXXX</filename> and "
-"<filename>package.config.XXXX</filename>"
+"filenames of the form <filename>package.template.XXXXXX</filename> and "
+"<filename>package.config.XXXXXX</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -6238,131 +6412,6 @@ msgid ""
 "100 on error."
 msgstr ""
 
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "apt"
-msgstr ""
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "16 June 1998"
-msgstr ""
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "Debian"
-msgstr ""
-
-#. type: SH
-#: apt.8:18
-#, no-wrap
-msgid "NAME"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:20
-msgid "apt - Advanced Package Tool"
-msgstr ""
-
-#. type: SH
-#: apt.8:20
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:22
-msgid "B<apt>"
-msgstr ""
-
-#. type: SH
-#: apt.8:22
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:31
-msgid ""
-"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-"System. Some options are only implemented in B<apt-get>(8)  though."
-msgstr ""
-
-#. type: SH
-#: apt.8:31
-#, no-wrap
-msgid "SEE ALSO"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:38
-msgid ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-msgstr ""
-
-#. type: SH
-#: apt.8:38
-#, no-wrap
-msgid "DIAGNOSTICS"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:40
-msgid "apt returns zero on normal operation, decimal 100 on error."
-msgstr ""
-
-#. type: SH
-#: apt.8:40
-#, no-wrap
-msgid "BUGS"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:42
-msgid "This manpage isn't even started."
-msgstr ""
-
-#. type: Plain text
-#: apt.8:51
-#, fuzzy
-msgid ""
-"See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-"B<reportbug>(1)  command."
-msgstr ""
-"\n"
-" <RefSect1><Title>Bugs</>\n"
-"   <para>\n"
-"   Consulte a <ulink url='http://bugs.debian.org/apt'>página de bugs do APT</"
-">.\n"
-"   Caso você queira relatar um bug no APT, por favor consulte o arquivo\n"
-"   <filename>/usr/share/doc/debian/bug-reporting.txt</> ou o comando "
-"&reportbug;.\n"
-" </RefSect1>\n"
-
-#. type: SH
-#: apt.8:51
-#, no-wrap
-msgid "AUTHOR"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:52
-#, fuzzy
-msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-msgstr ""
-"\n"
-" <RefSect1><Title>Author</>\n"
-"   <para>\n"
-"   O APT foi escrito pela equipe APT <email>apt@packages.debian.org</>.\n"
-" </RefSect1>\n"
-
 #. type: <title></title>
 #: guide.sgml:4
 msgid "APT User's Guide"
@@ -7442,6 +7491,31 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
+#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
+#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "B<reportbug>(1)  command."
+#~ msgstr ""
+#~ "\n"
+#~ " <RefSect1><Title>Bugs</>\n"
+#~ "   <para>\n"
+#~ "   Consulte a <ulink url='http://bugs.debian.org/apt'>página de bugs do "
+#~ "APT</>.\n"
+#~ "   Caso você queira relatar um bug no APT, por favor consulte o arquivo\n"
+#~ "   <filename>/usr/share/doc/debian/bug-reporting.txt</> ou o comando "
+#~ "&reportbug;.\n"
+#~ " </RefSect1>\n"
+
+#, fuzzy
+#~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
+#~ msgstr ""
+#~ "\n"
+#~ " <RefSect1><Title>Author</>\n"
+#~ "   <para>\n"
+#~ "   O APT foi escrito pela equipe APT <email>apt@packages.debian.org</>.\n"
+#~ " </RefSect1>\n"
+
+#, fuzzy
+#~ msgid ""
 #~ "Package: *\n"
 #~ "Pin: release n=karmic*\n"
 #~ "Pin-Priority: 990\n"
diff --git a/doc/po4a.conf b/doc/po4a.conf
index 14f19eddd..3f92c198a 100644
--- a/doc/po4a.conf
+++ b/doc/po4a.conf
@@ -12,6 +12,7 @@
 
 # define source file and translated file (one file per line)
 [type: entity]  apt.ent $lang:$lang/apt.ent
+[type: manpage] apt.8.xml $lang:$lang/apt.$lang.8.xml add_$lang:xml.add
 [type: manpage] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml add_$lang:xml.add
 [type: manpage] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml add_$lang:xml.add
 [type: manpage] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml add_$lang:xml.add
@@ -25,7 +26,6 @@
 [type: manpage] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml add_$lang:xml.add
 [type: manpage] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml add_$lang:xml.add
 [type: manpage] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml add_$lang:xml.add
-[type: man]     apt.8 $lang:$lang/apt.$lang.8
 
 [type: sgml]    guide.sgml $lang:$lang/guide.$lang.sgml
 #                 add_$lang::$lang/addendum/debiandoc_$lang.add
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 712f8469a..692f19e25 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -17,14 +17,23 @@
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/init.h>
-#include <algorithm>
+#include <apt-pkg/fileutl.h>
 
+#include <algorithm>
 #include <climits>
 #include <sys/time.h>
-#include <regex.h>
-
+#include <locale.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <functional>
+#include <iostream>
+#include <string>
+#include <vector>
+
+#include "cachedb.h"
+#include "override.h"
 #include "apt-ftparchive.h"
-#include "contents.h"
 #include "multicompress.h"
 #include "writer.h"
 
@@ -438,7 +447,7 @@ bool PackageMap::GenContents(Configuration &Setup,
 // ---------------------------------------------------------------------
 /* This populates the PkgList with all the possible permutations of the
    section/arch lists. */
-void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup)
+static void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup)
 {   
    // Load the defaults
    string DDir = Setup.Find("TreeDefault::Directory",
@@ -484,7 +493,7 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup)
 	 struct SubstVar const Vars[] = {{"$(DIST)",&Dist},
 					 {"$(SECTION)",&Section},
 					 {"$(ARCH)",&Arch},
-					 {}};
+					 {NULL, NULL}};
 	 mode_t const Perms = Block.FindI("FileMode", Permissions);
 	 bool const LongDesc = Block.FindB("LongDescription", LongDescription);
 	 TranslationWriter *TransWriter;
@@ -550,7 +559,7 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup)
 // LoadBinDir - Load a 'bindirectory' section from the Generate Config	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
+static void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
 {
    mode_t const Permissions = Setup.FindI("Default::FileMode",0644);
 
@@ -586,7 +595,7 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
 // ShowHelp - Show the help text					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ShowHelp(CommandLine &CmdL)
+static bool ShowHelp(CommandLine &)
 {
    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
@@ -639,7 +648,7 @@ bool ShowHelp(CommandLine &CmdL)
 // SimpleGenPackages - Generate a Packages file for a directory tree	/*{{{*/
 // ---------------------------------------------------------------------
 /* This emulates dpkg-scanpackages's command line interface. 'mostly' */
-bool SimpleGenPackages(CommandLine &CmdL)
+static bool SimpleGenPackages(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 2)
       return ShowHelp(CmdL);
@@ -667,7 +676,7 @@ bool SimpleGenPackages(CommandLine &CmdL)
 // SimpleGenContents - Generate a Contents listing			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool SimpleGenContents(CommandLine &CmdL)
+static bool SimpleGenContents(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 2)
       return ShowHelp(CmdL);
@@ -689,7 +698,7 @@ bool SimpleGenContents(CommandLine &CmdL)
 // SimpleGenSources - Generate a Sources file for a directory tree	/*{{{*/
 // ---------------------------------------------------------------------
 /* This emulates dpkg-scanpackages's command line interface. 'mostly' */
-bool SimpleGenSources(CommandLine &CmdL)
+static bool SimpleGenSources(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 2)
       return ShowHelp(CmdL);
@@ -722,7 +731,7 @@ bool SimpleGenSources(CommandLine &CmdL)
 									/*}}}*/
 // SimpleGenRelease - Generate a Release file for a directory tree	/*{{{*/
 // ---------------------------------------------------------------------
-bool SimpleGenRelease(CommandLine &CmdL)
+static bool SimpleGenRelease(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 2)
       return ShowHelp(CmdL);
@@ -747,7 +756,7 @@ bool SimpleGenRelease(CommandLine &CmdL)
 // Generate - Full generate, using a config file			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool Generate(CommandLine &CmdL)
+static bool Generate(CommandLine &CmdL)
 {
    struct CacheDB::Stats SrcStats;
    if (CmdL.FileSize() < 2)
@@ -911,7 +920,7 @@ bool Generate(CommandLine &CmdL)
 // Clean - Clean out the databases					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool Clean(CommandLine &CmdL)
+static bool Clean(CommandLine &CmdL)
 {
    if (CmdL.FileSize() != 2)
       return ShowHelp(CmdL);
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index c2318bf53..523c6b5fa 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -19,8 +19,12 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/debfile.h>
 
 #include <netinet/in.h>       // htonl, etc
+#include <ctype.h>
+#include <stddef.h>
+#include <sys/stat.h>
 
 #include "cachedb.h"
 
diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index b9ced9418..49b9a0ef5 100644
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -12,17 +12,19 @@
 #ifndef CACHEDB_H
 #define CACHEDB_H
 
-
 #include <apt-pkg/debfile.h>
 
 #include <db.h>
-#include <inttypes.h>
-#include <sys/stat.h>
 #include <errno.h>
 #include <string>
+#include <string.h>
+#include <stdint.h>
+#include <stdio.h>
 
 #include "contents.h"
 
+class FileFd;
+
 class CacheDB
 {
    protected:
diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index 80fe6e17e..7a1fb779e 100644
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -36,13 +36,12 @@
 #include <config.h>
 
 #include <apt-pkg/debfile.h>
-#include <apt-pkg/extracttar.h>
+#include <apt-pkg/dirstream.h>
 #include <apt-pkg/error.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
 
 #include "contents.h"
 
@@ -316,7 +315,7 @@ bool ContentsExtract::Read(debDebFile &Deb)
 // ContentsExtract::DoItem - Extract an item				/*{{{*/
 // ---------------------------------------------------------------------
 /* This just tacks the name onto the end of our memory buffer */
-bool ContentsExtract::DoItem(Item &Itm,int &Fd)
+bool ContentsExtract::DoItem(Item &Itm, int &/*Fd*/)
 {
    unsigned long Len = strlen(Itm.Name);
    
diff --git a/ftparchive/contents.h b/ftparchive/contents.h
index 4af9db574..dbbb83350 100644
--- a/ftparchive/contents.h
+++ b/ftparchive/contents.h
@@ -9,11 +9,13 @@
 									/*}}}*/
 #ifndef CONTENTS_H
 #define CONTENTS_H
-    
-#include <stdlib.h>
-#include <stdio.h>
+
 #include <apt-pkg/dirstream.h>
 
+#include <stddef.h>
+#include <stdio.h>
+#include <string>
+
 class debDebFile;
 
 class GenContents
diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index 1555d2f2d..f35d5304a 100644
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -20,13 +20,15 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/md5.h>
+#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/hashsum_template.h>
 
-#include <fcntl.h>
+#include <ctype.h>
+#include <vector>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <iostream>
 
 #include "multicompress.h"
 #include <apti18n.h>
diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h
index 388fad22e..ddd1815a3 100644
--- a/ftparchive/multicompress.h
+++ b/ftparchive/multicompress.h
@@ -22,7 +22,8 @@
 #include <string>
 #include <stdio.h>
 #include <sys/types.h>
-    
+#include <time.h>
+
 class MultiCompress
 {
    // An output file
diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index d2130db8a..8a0c5bab1 100644
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -16,6 +16,9 @@
 #include <apt-pkg/error.h>
 
 #include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include <utility>
 
 #include "override.h"
 
@@ -34,7 +37,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
    if (F == 0)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
    
-   char Line[500];
+   char Line[1000];
    unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {
@@ -129,7 +132,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
 // Override::ReadExtraOverride - Read the extra override file		/*{{{*/
 // ---------------------------------------------------------------------
 /* This parses the extra override file and reads it into the map */
-bool Override::ReadExtraOverride(string const &File,bool const &Source)
+bool Override::ReadExtraOverride(string const &File,bool const &/*Source*/)
 {
    if (File.empty() == true)
       return true;
@@ -138,7 +141,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
    if (F == 0)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
   
-   char Line[500];
+   char Line[1000];
    unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {
@@ -201,7 +204,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
 }
 									/*}}}*/
 
-// Override::GetItem - Get a architecture specific item 	/*{{{*/
+// Override::GetItem - Get a architecture specific item			/*{{{*/
 // ---------------------------------------------------------------------
 /* Returns a override item for the given package and the given architecture.
  * Treats "all" special
@@ -232,10 +235,10 @@ Override::Item* Override::GetItem(string const &Package, string const &Architect
          {
 	    result->FieldOverride[foI->first] = foI->second;
 	 }
-      } 
-   } 
+      }
+   }
    return result;
-};
+}
 
 
 // Override::Item::SwapMaint - Swap the maintainer field if necessary	/*{{{*/
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 7ecfe78ed..153c4fb42 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -13,28 +13,37 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/aptconfiguration.h>
-#include <apt-pkg/md5.h>
-#include <apt-pkg/hashes.h>
 #include <apt-pkg/deblistparser.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/gpgv.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/md5.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/debfile.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/sha1.h>
+#include <apt-pkg/sha2.h>
+#include <apt-pkg/tagfile.h>
 
+#include <ctype.h>
+#include <fnmatch.h>
+#include <ftw.h>
+#include <locale.h>
+#include <string.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <ctime>
-#include <ftw.h>
-#include <fnmatch.h>
 #include <iostream>
 #include <sstream>
 #include <memory>
+#include <utility>
 
+#include "apt-ftparchive.h"
 #include "writer.h"
 #include "cachedb.h"
-#include "apt-ftparchive.h"
 #include "multicompress.h"
 
 #include <apti18n.h>
@@ -72,9 +81,9 @@ FTWScanner::FTWScanner(string const &Arch): Arch(Arch)
 									/*}}}*/
 // FTWScanner::Scanner - FTW Scanner					/*{{{*/
 // ---------------------------------------------------------------------
-/* This is the FTW scanner, it processes each directory element in the 
+/* This is the FTW scanner, it processes each directory element in the
    directory tree. */
-int FTWScanner::ScannerFTW(const char *File,const struct stat *sb,int Flag)
+int FTWScanner::ScannerFTW(const char *File,const struct stat * /*sb*/,int Flag)
 {
    if (Flag == FTW_DNR)
    {
@@ -951,7 +960,7 @@ bool ContentsWriter::ReadFromPkgs(string const &PkgFile,string const &PkgCompres
 // ReleaseWriter::ReleaseWriter - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-ReleaseWriter::ReleaseWriter(string const &DB)
+ReleaseWriter::ReleaseWriter(string const &/*DB*/)
 {
    if (_config->FindB("APT::FTPArchive::Release::Default-Patterns", true) == true)
    {
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index 4932b0cc8..86884dcfc 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -13,14 +13,16 @@
 #ifndef WRITER_H
 #define WRITER_H
 
-
 #include <string>
 #include <stdio.h>
 #include <iostream>
 #include <vector>
 #include <map>
 #include <set>
+#include <stdlib.h>
+#include <sys/types.h>
 
+#include "contents.h"
 #include "cachedb.h"
 #include "override.h"
 #include "apt-ftparchive.h"
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 22d4b9164..74e2ecc6b 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -19,9 +19,9 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 
+#include <string>
+#include <vector>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <dlfcn.h>
 
 #include <iostream>
 #include <apti18n.h>
@@ -62,7 +62,7 @@ CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
                                           MountedByApt(false)
 {
    UdevCdroms.Dlopen();
-};
+}
 									/*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary			/*{{{*/
 // ---------------------------------------------------------------------
diff --git a/methods/connect.cc b/methods/connect.cc
index d9c9a1dd4..e2cbf4f5c 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <sstream>
-
+#include <string.h>
 #include<set>
 #include<string>
 
diff --git a/methods/copy.cc b/methods/copy.cc
index f2a8f9ed8..d59f032ff 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -17,9 +17,10 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 
+#include <string>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <unistd.h>
+
 #include <apti18n.h>
 									/*}}}*/
 
diff --git a/methods/file.cc b/methods/file.cc
index 3d0687c5b..12db62203 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -21,8 +21,9 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 
+#include <string>
 #include <sys/stat.h>
-#include <unistd.h>
+
 #include <apti18n.h>
 									/*}}}*/
 
diff --git a/methods/ftp.cc b/methods/ftp.cc
index 621f48476..66787a7be 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -23,7 +23,11 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/strutl.h>
 
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
@@ -42,6 +46,7 @@
 #include "rfc2553emu.h"
 #include "connect.h"
 #include "ftp.h"
+
 #include <apti18n.h>
 									/*}}}*/
 
@@ -56,9 +61,9 @@ struct AFMap
 };
 
 #ifndef AF_INET6
-struct AFMap AFMap[] = {{AF_INET,1},{}};
+struct AFMap AFMap[] = {{AF_INET,1},{0, 0}};
 #else
-struct AFMap AFMap[] = {{AF_INET,1},{AF_INET6,2},{}};
+struct AFMap AFMap[] = {{AF_INET,1},{AF_INET6,2},{0, 0}};
 #endif
 
 unsigned long TimeOut = 120;
@@ -1098,7 +1103,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
 }
 									/*}}}*/
 
-int main(int argc,const char *argv[])
+int main(int, const char *argv[])
 { 
    setlocale(LC_ALL, "");
 
diff --git a/methods/ftp.h b/methods/ftp.h
index 8055c389f..dd92f0086 100644
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -12,6 +12,8 @@
 
 #include <apt-pkg/strutl.h>
 
+#include <sys/types.h>
+#include <time.h>
 #include <string>
 
 class FTPConn
@@ -76,7 +78,7 @@ class FtpMethod : public pkgAcqMethod
    static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
-   static void SigTerm(int);
+   static APT_NORETURN void SigTerm(int);
    
    public:
    
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 25bf64ddd..ae521a2ed 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,19 +1,21 @@
 #include <config.h>
 
-#include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/indexcopy.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/gpgv.h>
+#include <apt-pkg/strutl.h>
 
-#include <stdio.h>
-#include <fcntl.h>
+#include <ctype.h>
 #include <errno.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/wait.h>
+#include <unistd.h>
 #include <iostream>
-#include <sstream>
+#include <string>
 #include <vector>
 
 #include <apti18n.h>
diff --git a/methods/gzip.cc b/methods/gzip.cc
index a2844e969..df3f8828f 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -11,17 +11,20 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/acquire-method.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/aptconfiguration.h>
 
+#include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
+#include <string>
+#include <vector>
+
 #include <apti18n.h>
 									/*}}}*/
 
@@ -58,17 +61,25 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       return _error->Error("Extraction of file %s requires unknown compressor %s", Path.c_str(), Prog);
 
    // Open the source and destination files
-   FileFd From;
-   From.Open(Path, FileFd::ReadOnly, *compressor);
-
-   if(From.FileSize() == 0)
-      return _error->Error(_("Empty files can't be valid archives"));
-
-   FileFd To(Itm->DestFile,FileFd::WriteAtomic);   
+   FileFd From, To;
+   if (_config->FindB("Method::Compress", false) == false)
+   {
+      From.Open(Path, FileFd::ReadOnly, *compressor);
+      if(From.FileSize() == 0)
+	 return _error->Error(_("Empty files can't be valid archives"));
+      To.Open(Itm->DestFile, FileFd::WriteAtomic);
+   }
+   else
+   {
+      From.Open(Path, FileFd::ReadOnly);
+      To.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty, *compressor);
+   }
    To.EraseOnFailure();
-   if (_error->PendingError() == true)
+
+   if (From.IsOpen() == false || From.Failed() == true ||
+	 To.IsOpen() == false || To.Failed() == true)
       return false;
-   
+
    // Read data from source, generate checksums and write
    Hashes Hash;
    bool Failed = false;
@@ -120,7 +131,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 }
 									/*}}}*/
 
-int main(int argc, char *argv[])
+int main(int, char *argv[])
 {
    setlocale(LC_ALL, "");
 
diff --git a/methods/http.cc b/methods/http.cc
index 42b31beeb..c734d3799 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -33,24 +33,22 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
+#include <apt-pkg/strutl.h>
 
+#include <stddef.h>
+#include <stdlib.h>
+#include <sys/select.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <signal.h>
 #include <stdio.h>
 #include <errno.h>
-#include <string.h>
-#include <climits>
 #include <iostream>
-#include <map>
-
-// Internet stuff
-#include <netdb.h>
+#include <sstream>
 
 #include "config.h"
 #include "connect.h"
-#include "rfc2553emu.h"
 #include "http.h"
 
 #include <apti18n.h>
@@ -61,7 +59,7 @@ unsigned long long CircleBuf::BwReadLimit=0;
 unsigned long long CircleBuf::BwTickReadData=0;
 struct timeval CircleBuf::BwReadTick={0,0};
 const unsigned int CircleBuf::BW_HZ=10;
- 
+
 // CircleBuf::CircleBuf - Circular input buffer				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -87,8 +85,8 @@ void CircleBuf::Reset()
    {
       delete Hash;
       Hash = new Hashes;
-   }   
-};
+   }
+}
 									/*}}}*/
 // CircleBuf::Read - Read from a FD into the circular buffer		/*{{{*/
 // ---------------------------------------------------------------------
@@ -473,7 +471,7 @@ bool HttpServerState::WriteResponse(const std::string &Data)		/*{{{*/
    return Out.Read(Data);
 }
 									/*}}}*/
-bool HttpServerState::IsOpen()						/*{{{*/
+APT_PURE bool HttpServerState::IsOpen()					/*{{{*/
 {
    return (ServerFd != -1);
 }
@@ -484,16 +482,11 @@ bool HttpServerState::InitHashes(FileFd &File)				/*{{{*/
    In.Hash = new Hashes;
 
    // Set the expected size and read file for the hashes
-   if (StartPos >= 0)
-   {
-      File.Truncate(StartPos);
-
-      return In.Hash->AddFD(File, StartPos);
-   }
-   return true;
+   File.Truncate(StartPos);
+   return In.Hash->AddFD(File, StartPos);
 }
 									/*}}}*/
-Hashes * HttpServerState::GetHashes()					/*{{{*/
+APT_PURE Hashes * HttpServerState::GetHashes()				/*{{{*/
 {
    return In.Hash;
 }
@@ -675,22 +668,13 @@ void HttpMethod::SendReq(FetchItem *Itm)
    URI Uri = Itm->Uri;
 
    // The HTTP server expects a hostname with a trailing :port
-   char Buf[1000];
+   std::stringstream Req;
    string ProperHost;
 
    if (Uri.Host.find(':') != string::npos)
       ProperHost = '[' + Uri.Host + ']';
    else
       ProperHost = Uri.Host;
-   if (Uri.Port != 0)
-   {
-      sprintf(Buf,":%u",Uri.Port);
-      ProperHost += Buf;
-   }   
-      
-   // Just in case.
-   if (Itm->Uri.length() >= sizeof(Buf))
-       abort();
 
    /* RFC 2616 §5.1.2 requires absolute URIs for requests to proxies,
       but while its a must for all servers to accept absolute URIs,
@@ -709,27 +693,20 @@ void HttpMethod::SendReq(FetchItem *Itm)
       in 1.1, can cause problems with proxies, and we are an HTTP/1.1
       client anyway.
       C.f. https://tools.ietf.org/wg/httpbis/trac/ticket/158 */
-   sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n",
-	   requesturi.c_str(),ProperHost.c_str());
+   Req << "GET " << requesturi << " HTTP/1.1\r\n";
+   if (Uri.Port != 0)
+      Req << "Host: " << ProperHost << ":" << Uri.Port << "\r\n";
+   else
+      Req << "Host: " << ProperHost << "\r\n";
 
    // generate a cache control header (if needed)
-   if (_config->FindB("Acquire::http::No-Cache",false) == true) 
-   {
-      strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n");
-   }
-   else
-   {
-      if (Itm->IndexFile == true) 
-      {
-	 sprintf(Buf+strlen(Buf),"Cache-Control: max-age=%u\r\n",
-		 _config->FindI("Acquire::http::Max-Age",0));
-      }
-      else
-      {
-	 if (_config->FindB("Acquire::http::No-Store",false) == true)
-	    strcat(Buf,"Cache-Control: no-store\r\n");
-      }
-   }
+   if (_config->FindB("Acquire::http::No-Cache",false) == true)
+      Req << "Cache-Control: no-cache\r\n"
+	 << "Pragma: no-cache\r\n";
+   else if (Itm->IndexFile == true)
+      Req << "Cache-Control: max-age=" << _config->FindI("Acquire::http::Max-Age",0) << "\r\n";
+   else if (_config->FindB("Acquire::http::No-Store",false) == true)
+      Req << "Cache-Control: no-store\r\n";
 
    // If we ask for uncompressed files servers might respond with content-
    // negotiation which lets us end up with compressed files we do not support,
@@ -741,46 +718,35 @@ void HttpMethod::SendReq(FetchItem *Itm)
       size_t const filepos = Itm->Uri.find_last_of('/');
       string const file = Itm->Uri.substr(filepos + 1);
       if (flExtension(file) == file)
-	 strcat(Buf,"Accept: text/*\r\n");
+	 Req << "Accept: text/*\r\n";
    }
 
-   string Req = Buf;
-
-   // Check for a partial file
+   // Check for a partial file and send if-queries accordingly
    struct stat SBuf;
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
-   {
-      // In this case we send an if-range query with a range header
-      sprintf(Buf,"Range: bytes=%lli-\r\nIf-Range: %s\r\n",(long long)SBuf.st_size,
-	      TimeRFC1123(SBuf.st_mtime).c_str());
-      Req += Buf;
-   }
-   else
-   {
-      if (Itm->LastModified != 0)
-      {
-	 sprintf(Buf,"If-Modified-Since: %s\r\n",TimeRFC1123(Itm->LastModified).c_str());
-	 Req += Buf;
-      }
-   }
+      Req << "Range: bytes=" << SBuf.st_size << "-\r\n"
+	 << "If-Range: " << TimeRFC1123(SBuf.st_mtime) << "\r\n";
+   else if (Itm->LastModified != 0)
+      Req << "If-Modified-Since: " << TimeRFC1123(Itm->LastModified).c_str() << "\r\n";
 
    if (Server->Proxy.User.empty() == false || Server->Proxy.Password.empty() == false)
-      Req += string("Proxy-Authorization: Basic ") + 
-          Base64Encode(Server->Proxy.User + ":" + Server->Proxy.Password) + "\r\n";
+      Req << "Proxy-Authorization: Basic "
+	 << Base64Encode(Server->Proxy.User + ":" + Server->Proxy.Password) << "\r\n";
 
    maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
    if (Uri.User.empty() == false || Uri.Password.empty() == false)
-   {
-      Req += string("Authorization: Basic ") + 
-          Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
-   }
-   Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
-		"Debian APT-HTTP/1.3 (" PACKAGE_VERSION ")") + "\r\n\r\n";
-   
+      Req << "Authorization: Basic "
+	 << Base64Encode(Uri.User + ":" + Uri.Password) << "\r\n";
+
+   Req << "User-Agent: " << _config->Find("Acquire::http::User-Agent",
+		"Debian APT-HTTP/1.3 (" PACKAGE_VERSION ")") << "\r\n";
+
+   Req << "\r\n";
+
    if (Debug == true)
       cerr << Req << endl;
 
-   Server->WriteResponse(Req);
+   Server->WriteResponse(Req.str());
 }
 									/*}}}*/
 // HttpMethod::Configuration - Handle a configuration message		/*{{{*/
diff --git a/methods/http.h b/methods/http.h
index 450a42eed..5406ce4a7 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -12,14 +12,18 @@
 #define APT_HTTP_H
 
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/acquire-method.h>
 
 #include <string>
+#include <sys/time.h>
+#include <iostream>
 
 #include "server.h"
 
 using std::cout;
 using std::endl;
 
+class FileFd;
 class HttpMethod;
 class Hashes;
 
diff --git a/methods/http_main.cc b/methods/http_main.cc
index 2ca91bfc9..3b346a514 100644
--- a/methods/http_main.cc
+++ b/methods/http_main.cc
@@ -1,14 +1,9 @@
 #include <config.h>
 
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/acquire-method.h>
 #include <signal.h>
 
-#include "connect.h"
-#include "rfc2553emu.h"
 #include "http.h"
 
-
 int main()
 {
    setlocale(LC_ALL, "");
diff --git a/methods/https.cc b/methods/https.cc
index febe6a0f0..e0348ab58 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -18,19 +18,20 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/strutl.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <signal.h>
 #include <stdio.h>
-#include <errno.h>
-#include <string.h>
 #include <iostream>
 #include <sstream>
+#include <ctype.h>
+#include <stdlib.h>
 
-#include "config.h"
 #include "https.h"
+
 #include <apti18n.h>
 									/*}}}*/
 using namespace std;
@@ -83,9 +84,9 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
    return size*nmemb;
 }
 
-int 
-HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, 
-			      double ultotal, double ulnow)
+int
+HttpsMethod::progress_callback(void *clientp, double dltotal, double /*dlnow*/,
+			      double /*ultotal*/, double /*ulnow*/)
 {
    HttpsMethod *me = (HttpsMethod *)clientp;
    if(dltotal > 0 && me->Res.Size == 0) {
@@ -95,7 +96,7 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
 }
 
 // HttpsServerState::HttpsServerState - Constructor			/*{{{*/
-HttpsServerState::HttpsServerState(URI Srv,HttpsMethod *Owner) : ServerState(Srv, NULL)
+HttpsServerState::HttpsServerState(URI Srv,HttpsMethod * /*Owner*/) : ServerState(Srv, NULL)
 {
    TimeOut = _config->FindI("Acquire::https::Timeout",TimeOut);
    Reset();
@@ -324,11 +325,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    // if we have the file send an if-range query with a range header
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    {
-      char Buf[1000];
-      sprintf(Buf, "Range: bytes=%li-", (long) SBuf.st_size);
-      headers = curl_slist_append(headers, Buf);
-      sprintf(Buf, "If-Range: %s", TimeRFC1123(SBuf.st_mtime).c_str());
-      headers = curl_slist_append(headers, Buf);
+      std::string Buf;
+      strprintf(Buf, "Range: bytes=%lli-", (long long) SBuf.st_size);
+      headers = curl_slist_append(headers, Buf.c_str());
+      strprintf(Buf, "If-Range: %s", TimeRFC1123(SBuf.st_mtime).c_str());
+      headers = curl_slist_append(headers, Buf.c_str());
    }
    else if(Itm->LastModified > 0)
    {
@@ -432,7 +433,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    delete File;
 
    return true;
-};
+}
 
 int main()
 {
diff --git a/methods/https.h b/methods/https.h
index ab0dd3407..faac8a3cd 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -11,37 +11,42 @@
 #ifndef APT_HTTPS_H
 #define APT_HTTPS_H
 
-#include <iostream>
+#include <apt-pkg/acquire-method.h>
+
 #include <curl/curl.h>
+#include <iostream>
+#include <stddef.h>
+#include <string>
 
 #include "server.h"
 
 using std::cout;
 using std::endl;
 
+class Hashes;
 class HttpsMethod;
 class FileFd;
 
 class HttpsServerState : public ServerState
 {
    protected:
-   virtual bool ReadHeaderLines(std::string &Data) { return false; }
-   virtual bool LoadNextResponse(bool const ToFile, FileFd * const File) { return false; }
+   virtual bool ReadHeaderLines(std::string &/*Data*/) { return false; }
+   virtual bool LoadNextResponse(bool const /*ToFile*/, FileFd * const /*File*/) { return false; }
 
    public:
-   virtual bool WriteResponse(std::string const &Data) { return false; }
+   virtual bool WriteResponse(std::string const &/*Data*/) { return false; }
 
    /** \brief Transfer the data from the socket */
-   virtual bool RunData(FileFd * const File) { return false; }
+   virtual bool RunData(FileFd * const /*File*/) { return false; }
 
    virtual bool Open() { return false; }
    virtual bool IsOpen() { return false; }
    virtual bool Close() { return false; }
-   virtual bool InitHashes(FileFd &File) { return false; }
+   virtual bool InitHashes(FileFd &/*File*/) { return false; }
    virtual Hashes * GetHashes() { return NULL; }
-   virtual bool Die(FileFd &File) { return false; }
-   virtual bool Flush(FileFd * const File) { return false; }
-   virtual bool Go(bool ToFile, FileFd * const File) { return false; }
+   virtual bool Die(FileFd &/*File*/) { return false; }
+   virtual bool Flush(FileFd * const /*File*/) { return false; }
+   virtual bool Go(bool /*ToFile*/, FileFd * const /*File*/) { return false; }
 
    HttpsServerState(URI Srv, HttpsMethod *Owner);
    virtual ~HttpsServerState() {Close();};
diff --git a/methods/mirror.cc b/methods/mirror.cc
index 085f3717b..d3aef91bc 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -16,18 +16,18 @@
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/hashes.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/metaindex.h>
+#include <apt-pkg/strutl.h>
 
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <algorithm>
-#include <fstream>
 #include <iostream>
-
-#include <stdarg.h>
+#include <fstream>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/utsname.h>
 #include <dirent.h>
 
@@ -60,7 +60,7 @@ using namespace std;
 MirrorMethod::MirrorMethod()
    : HttpMethod(), DownloadedMirrorFile(false), Debug(false)
 {
-};
+}
 
 // HttpMethod::Configuration - Handle a configuration message		/*{{{*/
 // ---------------------------------------------------------------------
@@ -90,17 +90,17 @@ bool MirrorMethod::Clean(string Dir)
    pkgSourceList list;
    list.ReadMainList();
 
-   DIR *D = opendir(Dir.c_str());   
+   DIR *D = opendir(Dir.c_str());
    if (D == 0)
       return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
-   
+
    string StartDir = SafeGetCWD();
    if (chdir(Dir.c_str()) != 0)
    {
       closedir(D);
       return _error->Errno("chdir",_("Unable to change to %s"),Dir.c_str());
    }
-   
+
    for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
    {
       // Skip some files..
@@ -123,23 +123,23 @@ bool MirrorMethod::Clean(string Dir)
       // nothing found, nuke it
       if (I == list.end())
 	 unlink(Dir->d_name);
-   };
+   }
 
    closedir(D);
    if (chdir(StartDir.c_str()) != 0)
       return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str());
-   return true;   
+   return true;
 }
 
 
-bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
+bool MirrorMethod::DownloadMirrorFile(string /*mirror_uri_str*/)
 {
-   // not that great to use pkgAcquire here, but we do not have 
+   // not that great to use pkgAcquire here, but we do not have
    // any other way right now
    string fetch = BaseUri;
    fetch.replace(0,strlen("mirror://"),"http://");
 
-#if 0 // no need for this, the getArchitectures() will also include the main 
+#if 0 // no need for this, the getArchitectures() will also include the main
       // arch
    // append main architecture
    fetch += "?arch=" + _config->Find("Apt::Architecture");
@@ -173,7 +173,7 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
 
    if(Debug)
       clog << "MirrorMethod::DownloadMirrorFile() success: " << res << endl;
-   
+
    return res;
 }
 
@@ -187,13 +187,13 @@ bool MirrorMethod::RandomizeMirrorFile(string mirror_file)
    if (!FileExists(mirror_file))
       return false;
 
-   // read 
+   // read
    ifstream in(mirror_file.c_str());
    while ( !in.eof() ) {
       getline(in, line);
       content.push_back(line);
    }
-   
+
    // we want the file to be random for each different machine, but also
    // "stable" on the same machine. this is to avoid running into out-of-sync
    // issues (i.e. Release/Release.gpg different on each mirror)
@@ -422,10 +422,10 @@ bool MirrorMethod::Fetch(FetchItem *Itm)
 
    if(Debug)
       clog << "Fetch: " << Itm->Uri << endl << endl;
-   
+
    // now run the real fetcher
    return HttpMethod::Fetch(Itm);
-};
+}
 
 void MirrorMethod::Fail(string Err,bool Transient)
 {
@@ -437,7 +437,7 @@ void MirrorMethod::Fail(string Err,bool Transient)
 
    // try the next mirror on fail (if its not a expected failure,
    // e.g. translations are ok to ignore)
-   if (!Queue->FailIgnore && TryNextMirror()) 
+   if (!Queue->FailIgnore && TryNextMirror())
       return;
 
    // all mirrors failed, so bail out
diff --git a/methods/mirror.h b/methods/mirror.h
index 1dd9f2ec6..6c0ce370e 100644
--- a/methods/mirror.h
+++ b/methods/mirror.h
@@ -11,6 +11,8 @@
 #ifndef APT_MIRROR_H
 #define APT_MIRROR_H
 
+#include <apt-pkg/acquire-method.h>
+
 #include <iostream>
 #include <string>
 #include <vector>
diff --git a/methods/rred.cc b/methods/rred.cc
index fe7ef7322..cabb3c456 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -8,19 +8,18 @@
 #include <config.h>
 
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
 
+#include <stddef.h>
+#include <iostream>
 #include <string>
 #include <list>
 #include <vector>
-#include <iterator>
 
-#include <fcntl.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -469,7 +468,7 @@ class Patch {
 
    void write_diff(FILE *f)
    {
-      size_t line = 0;
+      unsigned long long line = 0;
       std::list<struct Change>::reverse_iterator ch;
       for (ch = filechanges.rbegin(); ch != filechanges.rend(); ++ch) {
 	 line += ch->offset + ch->del_cnt;
@@ -482,11 +481,11 @@ class Patch {
 	 line -= ch->del_cnt;
 	 if (ch->add_cnt > 0) {
 	    if (ch->del_cnt == 0) {
-	       fprintf(f, "%lua\n", line);
+	       fprintf(f, "%llua\n", line);
 	    } else if (ch->del_cnt == 1) {
-	       fprintf(f, "%luc\n", line+1);
+	       fprintf(f, "%lluc\n", line+1);
 	    } else {
-	       fprintf(f, "%lu,%luc\n", line+1, line+ch->del_cnt);
+	       fprintf(f, "%llu,%lluc\n", line+1, line+ch->del_cnt);
 	    }
 
 	    mg_i = ch;
@@ -496,9 +495,9 @@ class Patch {
 
 	    fprintf(f, ".\n");
 	 } else if (ch->del_cnt == 1) {
-	    fprintf(f, "%lud\n", line+1);
+	    fprintf(f, "%llud\n", line+1);
 	 } else if (ch->del_cnt > 1) {
-	    fprintf(f, "%lu,%lud\n", line+1, line+ch->del_cnt);
+	    fprintf(f, "%llu,%llud\n", line+1, line+ch->del_cnt);
 	 }
 	 line -= ch->offset;
       }
diff --git a/methods/rsh.cc b/methods/rsh.cc
index 550f77eca..bd46d2515 100644
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -17,7 +17,11 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/acquire-method.h>
+#include <apt-pkg/strutl.h>
 
+#include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
@@ -368,7 +372,7 @@ RSHMethod::RSHMethod() : pkgAcqMethod("1.0",SendConfig)
    signal(SIGINT,SigTerm);
    Server = 0;
    FailFd = -1;
-};
+}
 									/*}}}*/
 // RSHMethod::Configuration - Handle a configuration message		/*{{{*/
 // ---------------------------------------------------------------------
@@ -390,7 +394,7 @@ bool RSHMethod::Configuration(std::string Message)
 // RSHMethod::SigTerm - Clean up and timestamp the files on exit	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void RSHMethod::SigTerm(int sig)
+void RSHMethod::SigTerm(int)
 {
    if (FailFd == -1)
       _exit(100);
@@ -519,7 +523,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
 }
 									/*}}}*/
 
-int main(int argc, const char *argv[])
+int main(int, const char *argv[])
 {
    setlocale(LC_ALL, "");
 
diff --git a/methods/rsh.h b/methods/rsh.h
index d7efa3f06..dd259e744 100644
--- a/methods/rsh.h
+++ b/methods/rsh.h
@@ -11,6 +11,8 @@
 #define APT_RSH_H
 
 #include <string>
+#include <time.h>
+
 #include <apt-pkg/strutl.h>
 
 class Hashes;
@@ -62,7 +64,7 @@ class RSHMethod : public pkgAcqMethod
    static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
-   static void SigTerm(int);
+   static APT_NORETURN void SigTerm(int);
 
    public:
 
diff --git a/methods/server.cc b/methods/server.cc
index ef90c809c..5a13f18a7 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -10,32 +10,27 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/hashes.h>
-#include <apt-pkg/netrc.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 
-#include <fcntl.h>
+#include <ctype.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <time.h>
 #include <unistd.h>
-#include <signal.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <climits>
 #include <iostream>
+#include <limits>
 #include <map>
+#include <string>
+#include <vector>
 
-// Internet stuff
-#include <netdb.h>
-
-#include "config.h"
-#include "connect.h"
-#include "rfc2553emu.h"
-#include "http.h"
+#include "server.h"
 
 #include <apti18n.h>
 									/*}}}*/
@@ -119,10 +114,10 @@ bool ServerState::HeaderLine(string Line)
    string::size_type Pos2 = Pos;
    while (Pos2 < Line.length() && isspace(Line[Pos2]) != 0)
       Pos2++;
-      
+
    string Tag = string(Line,0,Pos);
    string Val = string(Line,Pos2);
-   
+
    if (stringcasecmp(Tag.c_str(),Tag.c_str()+4,"HTTP") == 0)
    {
       // Evil servers return no version
@@ -159,14 +154,14 @@ bool ServerState::HeaderLine(string Line)
       }
 
       return true;
-   }      
-      
+   }
+
    if (stringcasecmp(Tag,"Content-Length:") == 0)
    {
       if (Encoding == Closes)
 	 Encoding = Stream;
       HaveContent = true;
-      
+
       // The length is already set from the Content-Range header
       if (StartPos != 0)
 	 return true;
@@ -184,7 +179,7 @@ bool ServerState::HeaderLine(string Line)
       HaveContent = true;
       return true;
    }
-   
+
    if (stringcasecmp(Tag,"Content-Range:") == 0)
    {
       HaveContent = true;
@@ -201,12 +196,12 @@ bool ServerState::HeaderLine(string Line)
 	 return _error->Error(_("This HTTP server has broken range support"));
       return true;
    }
-   
+
    if (stringcasecmp(Tag,"Transfer-Encoding:") == 0)
    {
       HaveContent = true;
       if (stringcasecmp(Val,"chunked") == 0)
-	 Encoding = Chunked;      
+	 Encoding = Chunked;
       return true;
    }
 
@@ -218,7 +213,7 @@ bool ServerState::HeaderLine(string Line)
 	 Persistent = true;
       return true;
    }
-   
+
    if (stringcasecmp(Tag,"Last-Modified:") == 0)
    {
       if (RFC1123StrToTime(Val.c_str(), Date) == false)
@@ -413,7 +408,7 @@ bool ServerMethod::Fetch(FetchItem *)
    }
    
    return true;
-};
+}
 									/*}}}*/
 // ServerMethod::Loop - Main loop					/*{{{*/
 int ServerMethod::Loop()
diff --git a/methods/server.h b/methods/server.h
index 2b81e6173..0f45ab994 100644
--- a/methods/server.h
+++ b/methods/server.h
@@ -12,7 +12,10 @@
 #define APT_SERVER_H
 
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/acquire-method.h>
 
+#include <time.h>
+#include <iostream>
 #include <string>
 
 using std::cout;
@@ -32,7 +35,7 @@ struct ServerState
 
    // These are some statistics from the last parsed header lines
    unsigned long long Size;
-   signed long long StartPos;
+   unsigned long long StartPos;
    time_t Date;
    bool HaveContent;
    enum {Chunked,Stream,Closes} Encoding;
@@ -62,7 +65,7 @@ struct ServerState
       /** \brief IO error while retrieving */
       RUN_HEADERS_IO_ERROR,
       /** \brief Parse error after retrieving */
-      RUN_HEADERS_PARSE_ERROR,
+      RUN_HEADERS_PARSE_ERROR
    };
    /** \brief Get the headers before the data */
    RunHeadersResult RunHeaders(FileFd * const File);
@@ -126,7 +129,7 @@ class ServerMethod : public pkgAcqMethod
    static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
-   static void SigTerm(int);
+   static APT_NORETURN void SigTerm(int);
 
    virtual bool Configuration(std::string Message);
    virtual bool Flush() { return Server->Flush(File); };
diff --git a/po/ar.po b/po/ar.po
index 3b98d34fc..e570c25a4 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -19,156 +19,157 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "الحزمة %s النسخة %s لها معتمد غير مستوفى:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "أسماء الحزم الكلية :"
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "أسماء الحزم الكلية :"
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr " الحزم العادية:"
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "الحزمة الوهمية تماماً:"
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr " الحزمة الوهمية المفردة:"
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr " الحزم الوهمية المختلطة:"
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr " مفقودة:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "مجموع النسخ الفريدة:"
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "مجموع النسخ الفريدة:"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "مجموع المعتمدات:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "مجموع المساحة المحسوب حسابها:"
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "لم يُعثر على أية حزم"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "يجب أن تعطي صيغة واحدة بالضبط"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "ملفات الحزم:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "الحزم المُدبّسة:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(غير موجود)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr " مُثبّت:"
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  مرشّح: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(لاشيء)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr " جدول النسخ:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -205,29 +206,29 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "الرجاء كتابة اسم لهذا القرص، مثال 'Debian 2.1r1 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "فشل تغيير اسم %s إلى %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة."
 
@@ -251,65 +252,65 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "تعذر قَفْل دليل التنزيل"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "تعذر العثور على مصدر الحزمة %s"
@@ -329,151 +330,151 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "تعذر حساب المساحة الحرة في %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ليس هناك مساحة كافية في %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "إحضار المصدر %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "فشل إحضار بعض الأرشيفات."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "أمر فك الحزمة '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "أمر البناء '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "الاتصال بـ%s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "الوحدات المدعومة:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -519,53 +520,74 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "إلا أنها غير مثبتة"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s هي النسخة الأحدث.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s هي النسخة الأحدث.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "فشل فتح %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -592,7 +614,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -640,52 +662,52 @@ msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون ل�
 msgid "Disk not found."
 msgstr "لم يُعثر على القرص."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "لم يُعثر على الملف"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "فشيل تنفيذ stat"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "فشل تعيين وقت التعديل"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "تسجيل الدخول"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "رفض الخادم اتصالنا بالرد: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "فشل USER، ردّ الخادم: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "فشل PASS، ردّ الخادم: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -693,121 +715,123 @@ msgstr ""
 "تم تحديد خادم بروكسي ولكن دون نص تسجيل دخول برمجي،  Acquire::ftp::ProxyLogin "
 "فارغ."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ الخادم: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "فشل TYPE، ردّ الخادم: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "انتهى وقت الاتصال"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "أغلق الخادم الاتصال"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "خطأ في القراءة"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "خطأ في الكتابة"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "فشل"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "تعذر إرسال الأمر PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "فشل EPRT، ردّ الخادم: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "تعذر قبول الاتصال"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "تعذر إحضار الملف، ردّ الخادم '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "فشل نقل البيانات، ردّ الخادم '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "استعلام"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr ""
 
@@ -843,7 +867,7 @@ msgstr "تعذر الاتصال بـ%s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "الاتصال بـ%s"
@@ -873,181 +897,415 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "تعذر الاتصال بـ%s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "خطأ في القراءة من الخادم"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "فشل التحديد"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "انتهى وقت الاتصال"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "خطأ في الكتابة إلى ملف المُخرجات"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "بانتظار الترويسات"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "سطر ترويسة سيء"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "أرسل خادم http ترويسة ردّ غير صالحة"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "خادم http له دعم مدى معطوب"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "نسق تاريخ مجهول"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "بيانات ترويسة سيئة"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "فشل الاتصال"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "حساب الترقية..."
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "تمّ"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "تصحيح المعتمدات..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " فشل."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "لم يمكن تصحيح المعتمدات"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "لم يمكن تقليص مجموعة الترقية"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " تم"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "إلا أن %s مثبت"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "إلا أنه سيتم تثبيت %s"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "إلا أنه غير قابل للتثبيت"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "إلا أنها حزمة وهمية"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "إلا أنها غير مثبتة"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "إلا أنه لن يتم تثبيتها"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " أو"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "سيتم تثبيت الحزم الجديدة التالية:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "سيتم إزالة الحزم التالية:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "سيتم الإبقاء على الحزم التالية:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "ستتم ترقية الحزم التالية:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "سيتم تثبيط الحزم التالية:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "سيتم تغيير الحزم المبقاة التالية:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (بسبب %s) "
+
+#: apt-private/private-output.cc:662
+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"
+"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً،  "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu أعيد تثبيتها، "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu مثبطة، "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "لا يقبل الأمر update أية مُعطيات"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "خطأ داخلي، لم تنته عملية الترتيب"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "يا للغرابة... لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "بحاجة إلى جلب %sب من الأرشيف.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "ليس هناك مساحة كافية في %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "نعم، افعل ما أقوله!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1058,19 +1316,19 @@ msgstr ""
 "كي تستمر اكتب العبارة '%s'\n"
 " ؟] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "إجهاض."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "هل تريد الاستمرار؟"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "فشل تنزيل بعض الملفات"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1078,19 +1336,19 @@ msgstr ""
 "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --"
 "fix-missing؟"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "تعذر تصحيح الحزم المفقودة."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "إجهاض التثبيت."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1100,15 +1358,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1124,16 +1382,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1143,7 +1401,7 @@ msgid_plural ""
 msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1151,24 +1409,24 @@ msgid_plural ""
 msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "قد ترغب بتشغيل 'apt-get -f install' لتصحيح هذه:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1176,318 +1434,92 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "حزم معطوبة"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "الحزم المقترحة:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "الحزم المستحسنة:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "تم غض النظر عن تحذير المصادقة.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "تعذرت المصادقة على بعض الحزم"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "تثبيت هذه الحزم دون التحقق منها؟"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "فشل إحضار %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "إلا أن %s مثبت"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "إلا أنه سيتم تثبيت %s"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "إلا أنه غير قابل للتثبيت"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "إلا أنها حزمة وهمية"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "إلا أنها غير مثبتة"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "إلا أنه لن يتم تثبيتها"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " أو"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "سيتم إزالة الحزم التالية:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "سيتم الإبقاء على الحزم التالية:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "ستتم ترقية الحزم التالية:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "سيتم تثبيط الحزم التالية:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "سيتم تغيير الحزم المبقاة التالية:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (بسبب %s) "
-
-#: apt-private/private-output.cc:631
-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"
-"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً،  "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu أعيد تثبيتها، "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu مثبطة، "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "تصحيح المعتمدات..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " فشل."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "لم يمكن تصحيح المعتمدات"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "لم يمكن تقليص مجموعة الترقية"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " تم"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "لا يقبل الأمر update أية مُعطيات"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "حساب الترقية..."
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "تمّ"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "فشل تغيير اسم %s إلى %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr ""
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "جلب:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "تجاهل"
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "خطأ"
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "جلب %sب في %s (%sب/ث)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [يعمل]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1500,19 +1532,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "تعذرت قراءة %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
@@ -1541,11 +1573,11 @@ msgstr "فشل إغلاق الملف %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr ""
 
@@ -1585,1682 +1617,1682 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها �
 msgid "Merging available information"
 msgstr "دمج المعلومات المتوفرة"
 
-#: cmdline/apt-extracttemplates.cc:224
-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"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "تعذرت الكتابة إلى %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "قائمة توسيعات الحزمة طويلة جداً"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "خطأ داخلي في AddDiversion"
 
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Error processing directory %s"
-msgstr "خطأ في معالجة الدليل %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "قائمة توسيعات المصدر طويلة جداً"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:409
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Error processing contents %s"
-msgstr "خطأ في معالجة المحتويات %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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"
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "لم تُطابق أية تحديدات"
-
-#: ftparchive/apt-ftparchive.cc:881
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'"
+msgid "Duplicate conf file %s/%s"
+msgstr "ملف تهيئة مُزدوج %s/%s"
 
-#: ftparchive/cachedb.cc:47
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old"
+msgid "The path %s is too long"
+msgstr "المسار %s طويل جداً"
 
-#: ftparchive/cachedb.cc:65
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "قاعدة البيانات قديمة، محاولة ترقية %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
+msgid "Unpacking %s more than once"
+msgstr "فكّ تحزيم %s أكثر من مرّة"
 
-#: ftparchive/cachedb.cc:81
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+msgid "The directory %s is diverted"
+msgstr ""
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "Failed to stat %s"
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
 msgstr ""
 
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
 msgstr ""
 
-#: ftparchive/writer.cc:82
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: تعذرت قراءة الدليل %s\n"
+msgid "Failed to rename %s to %s"
+msgstr "فشل تغيير اسم %s إلى %s"
 
-#: ftparchive/writer.cc:87
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "W: Unable to stat %s\n"
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr ""
 
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "المسار طويل جداً"
 
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
+#: apt-inst/extract.cc:421
+#, c-format
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to resolve %s"
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
+#: apt-inst/extract.cc:498
+#, c-format
+msgid "Unable to stat %s"
 msgstr ""
 
-#: ftparchive/writer.cc:210
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Failed to open %s"
-msgstr "فشل فتح %s"
+msgid "Failed to write file %s"
+msgstr "فشلت كتابة الملف %s"
 
-#: ftparchive/writer.cc:269
+#: apt-inst/dirstream.cc:105
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Failed to close file %s"
+msgstr "فشل إغلاق الملف %s"
 
-#: ftparchive/writer.cc:277
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Failed to readlink %s"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: ftparchive/writer.cc:281
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to unlink %s"
+msgid "Internal error, could not locate member %s"
+msgstr "خطأ داخلي، تعذر العثور على العضو %s"
+
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
 msgstr ""
 
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** فشل ربط %s بـ%s"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "توقيع الأرشيف غير صالح"
 
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
 msgstr ""
 
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:96
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "توقيع الأرشيف غير صالح"
 
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
 msgstr ""
 
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "الأرشيف قصير جداً"
 
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "فشلت قراءة ترويسات الأرشيف"
 
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
 msgstr ""
 
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - فشل تعيين الذاكرة"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "فشل تنفيذ gzip"
 
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "تعذر فتح %s"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "أرشيف فاسد"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد"
+
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
+msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Failed to read the override file %s"
+msgid "Unable to stat %s."
 msgstr ""
 
-#: ftparchive/override.cc:163
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Malformed override %s line %llu #1"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: ftparchive/override.cc:188
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Malformed override %s line %llu #3"
+msgid "Packaging system '%s' is not supported"
+msgstr "نظام الحزم '%s' غير مدعوم"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: ftparchive/multicompress.cc:71
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unknown compression algorithm '%s'"
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: ftparchive/multicompress.cc:101
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Compressed output %s needs a compression set"
+msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "خطأ داخلي، تعذر إنشاء %s"
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "MD5Sum غير متطابقة"
 
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: ftparchive/multicompress.cc:357
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem unlinking %s"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "فشل تغيير اسم %s إلى %s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "الرجاء إدخال القرص المُسمّى  '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
 
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "سجل حزمة مجهول!"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "تعذرت قراءة قائمة المصادر."
 
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "فشل تنفيذ gzip"
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "أرشيف فاسد"
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد"
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:306
+#: apt-pkg/pkgcache.cc:174
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
+msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "توقيع الأرشيف غير صالح"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "توقيع الأرشيف غير صالح"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr ""
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "يعتمد"
 
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "الأرشيف قصير جداً"
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "يعتمد مسبقاً"
 
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "فشلت قراءة ترويسات الأرشيف"
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "يستحسن"
 
-#: apt-inst/filelist.cc:382
-msgid "DropNode called on still linked node"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "يقترح"
 
-#: apt-inst/filelist.cc:414
-msgid "Failed to locate the hash element!"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "يعارض"
 
-#: apt-inst/filelist.cc:461
-msgid "Failed to allocate diversion"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "يستبدل"
 
-#: apt-inst/filelist.cc:466
-msgid "Internal error in AddDiversion"
-msgstr "خطأ داخلي في AddDiversion"
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "يُلغي"
 
-#: apt-inst/filelist.cc:479
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
 msgstr ""
 
-#: apt-inst/filelist.cc:508
-#, c-format
-msgid "Double add of diversion %s -> %s"
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
 msgstr ""
 
-#: apt-inst/filelist.cc:551
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "ملف تهيئة مُزدوج %s/%s"
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "مهم"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "فشلت كتابة الملف %s"
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "مطلوب"
 
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "فشل إغلاق الملف %s"
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "قياسي"
 
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
-#, c-format
-msgid "The path %s is too long"
-msgstr "المسار %s طويل جداً"
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "اختياري"
 
-#: apt-inst/extract.cc:125
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "فكّ تحزيم %s أكثر من مرّة"
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "إضافي"
 
-#: apt-inst/extract.cc:135
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "The directory %s is diverted"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-inst/extract.cc:145
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
-msgid "The diversion path is too long"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-inst/extract.cc:242
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-inst/extract.cc:282
-msgid "Failed to locate node in its hash bucket"
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-inst/extract.cc:286
-msgid "The path is too long"
-msgstr "المسار طويل جداً"
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
 
-#: apt-inst/extract.cc:414
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
-msgid "Overwrite package match with no version for %s"
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-inst/extract.cc:431
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-inst/extract.cc:491
-#, c-format
-msgid "Unable to stat %s"
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "قراءة قوائم الحزم"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "Unable to write to %s"
+msgstr "تعذرت الكتابة إلى %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:124
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "خطأ داخلي، تعذر العثور على العضو %s"
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-inst/deb/debfile.cc:219
-msgid "Unparsable control file"
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "تعذر التغيير إلى %s"
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "تعذر فتح %s"
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/acquire-item.cc:163
 #, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "تعذر إرسال الأمر PORT"
+msgid "Hash Sum mismatch"
+msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "الحجم غير متطابق"
 
-#: apt-pkg/contrib/mmap.cc:322
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
-msgid "Failed to truncate file"
-msgstr "فشلت كتابة الملف %s"
+msgid "Invalid file format"
+msgstr "عمليّة غير صالحة %s"
 
-#: apt-pkg/contrib/mmap.cc:341
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
+#: apt-pkg/acquire-item.cc:1595
+#, fuzzy, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+
+#: apt-pkg/acquire-item.cc:1637
+msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:449
+#: apt-pkg/acquire-item.cc:1675
+#, c-format
 msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
-msgid "%lid %lih %limin %lis"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
-msgid "%lih %limin %lis"
+msgid ""
+"An error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
-msgid "%limin %lis"
+msgid "GPG error: %s: %s"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
-msgid "%lis"
+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/contrib/strutl.cc:1229
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
-msgid "Selection %s not found"
-msgstr "تعذر العثور على التحديد %s"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:503
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "اختصار نوع مجهول: '%c'"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:617
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "فتح ملف التهيئة %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
+msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:804
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "Syntax error %s:%u: Malformed tag"
+msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:821
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "تعذر قفل دليل القائمة"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:861
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid "Retrieving file %li of %li"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/policy.cc:422
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
+msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... خطأ!"
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr ""
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... تمّ"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... تمّ"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "خيار سطر الأمر '%c' [من %s] مجهول."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "خيار سطر الأمر %s غير مفهوم"
+msgid "Could not configure '%s'. "
+msgstr "فشل إغلاق الملف %s"
 
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Command line option %s is not boolean"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "الخيار %s يتطلّب مُعطى."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:273
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "فك تركيب القرص المدمج...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "الخيار '%s' طويل جداً"
+#: apt-pkg/cdrom.cc:599
+msgid "Waiting for disc...\n"
+msgstr "بانتظار القرص...\n"
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr ""
+#: apt-pkg/cdrom.cc:609
+msgid "Mounting CD-ROM...\n"
+msgstr "تركيب القرص...\n"
 
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "عمليّة غير صالحة %s"
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "جاري التعرف..."
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/cdrom.cc:662
 #, c-format
-msgid "Unable to stat the mount point %s"
+msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:95
-#, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "مشكلة في إغلاق الملف"
-
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/cdrom.cc:734
 #, c-format
-msgid "Not using locking for read only lock file %s"
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
+#: apt-pkg/cdrom.cc:744
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/cdrom.cc:771
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
+msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr ""
+#: apt-pkg/cdrom.cc:800
+msgid "That is not a valid name, try again.\n"
+msgstr "هذا الاسم غير صالح، حاول مجدداً.\n"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/cdrom.cc:817
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
 msgstr ""
+"هذا القرص مسمى: \n"
+"'%s'\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+#: apt-pkg/cdrom.cc:819
+msgid "Copying package lists..."
+msgstr "نسخ قوائم الحزم..."
 
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+#: apt-pkg/cdrom.cc:863
+msgid "Writing new source list\n"
+msgstr "كتابة لائحة المصادر الجديدة\n"
+
+#: apt-pkg/cdrom.cc:874
+msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/algorithms.cc:265
 #, c-format
 msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "دمج المعلومات المتوفرة"
+
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "فشل إغلاق الملف %s"
+msgid "Failed to open StateFile %s"
+msgstr "فشل فتح %s"
 
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "فشلت كتابة الملف %s"
 
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
+#: apt-pkg/tagfile.cc:140
+#, c-format
+msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "read, still have %llu to read but none left"
+msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgid "Release '%s' for '%s' was not found"
+msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
 
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "مشكلة في إغلاق الملف"
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "مشكلة في مزامنة الملف"
+msgid "Couldn't find task '%s'"
+msgstr "تعذر العثور على الحزمة %s"
 
-#: apt-pkg/contrib/fileutl.cc:1746
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "مشكلة في إغلاق الملف"
-
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "مشكلة في مزامنة الملف"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "تعذر العثور على الحزمة %s"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "إجهاض التثبيت."
-
-#: apt-pkg/pkgcache.cc:148
-msgid "Empty package cache"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:154
-msgid "The package cache file is corrupted"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:159
-msgid "The package cache file is an incompatible version"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:162
-msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgid "Couldn't find any package by glob '%s'"
+msgstr "تعذر العثور على الحزمة %s"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:172
-msgid "The package cache was built for a different architecture"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:314
-msgid "Depends"
-msgstr "يعتمد"
-
-#: apt-pkg/pkgcache.cc:314
-msgid "PreDepends"
-msgstr "يعتمد مسبقاً"
-
-#: apt-pkg/pkgcache.cc:314
-msgid "Suggests"
-msgstr "يستحسن"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Recommends"
-msgstr "يقترح"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Conflicts"
-msgstr "يعارض"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Replaces"
-msgstr "يستبدل"
-
-#: apt-pkg/pkgcache.cc:316
-msgid "Obsoletes"
-msgstr "يُلغي"
-
-#: apt-pkg/pkgcache.cc:316
-msgid "Breaks"
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:316
-msgid "Enhances"
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
-msgid "important"
-msgstr "مهم"
-
-#: apt-pkg/pkgcache.cc:327
-msgid "required"
-msgstr "مطلوب"
-
-#: apt-pkg/pkgcache.cc:327
-msgid "standard"
-msgstr "قياسي"
-
-#: apt-pkg/pkgcache.cc:328
-msgid "optional"
-msgstr "اختياري"
-
-#: apt-pkg/pkgcache.cc:328
-msgid "extra"
-msgstr "إضافي"
-
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-#, fuzzy
-msgid "Reading state information"
-msgstr "دمج المعلومات المتوفرة"
-
-#: apt-pkg/depcache.cc:244
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "فشل فتح %s"
+msgid "Unable to parse Release file %s"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/indexrecords.cc:86
 #, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "فشلت كتابة الملف %s"
+msgid "No sections in Release file %s"
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
-#: apt-pkg/tagfile.cc:138
+#: apt-pkg/indexrecords.cc:117
 #, c-format
-msgid "Unable to parse package file %s (1)"
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
-#: apt-pkg/sourcelist.cc:118
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+
+#: apt-pkg/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:161
+#: apt-pkg/sourcelist.cc:170
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:173
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:175
+#: apt-pkg/sourcelist.cc:184
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:181
+#: apt-pkg/sourcelist.cc:190
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/sourcelist.cc:193
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:197
+#: apt-pkg/sourcelist.cc:206
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:208
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:211
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:217
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:215
+#: apt-pkg/sourcelist.cc:224
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:326
+#: apt-pkg/sourcelist.cc:335
 #, c-format
 msgid "Opening %s"
 msgstr "فتح %s"
 
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:362
+#: apt-pkg/sourcelist.cc:371
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:366
+#: apt-pkg/sourcelist.cc:375
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:407
+#: apt-pkg/sourcelist.cc:416
 #, c-format
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
+#: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "فشل إغلاق الملف %s"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
+msgid "Installing %s"
+msgstr "تم تثبيت %s"
 
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
+msgid "Configuring %s"
+msgstr "تهيئة %s"
 
-#: apt-pkg/algorithms.cc:266
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
+msgid "Removing %s"
+msgstr "إزالة %s"
 
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "تمت إزالة %s بالكامل"
 
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
+#: apt-pkg/deb/dpkgpm.cc:99
+#, c-format
+msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "List directory %spartial is missing."
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/acquire.cc:85
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
-msgid "Archives directory %spartial is missing."
+msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/acquire.cc:93
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "تعذر قفل دليل القائمة"
+msgid "Could not open file '%s'"
+msgstr "فشل إغلاق الملف %s"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
+msgid "Preparing %s"
+msgstr "تحضير %s"
 
-#: apt-pkg/acquire.cc:895
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
-msgid "Retrieving file %li of %li"
-msgstr ""
+msgid "Unpacking %s"
+msgstr "فتح %s"
 
-#: apt-pkg/acquire-worker.cc:113
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
+msgid "Preparing to configure %s"
+msgstr "التحضير لتهيئة %s"
 
-#: apt-pkg/acquire-worker.cc:115
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
-msgid "Is the package %s installed?"
-msgstr ""
+msgid "Installed %s"
+msgstr "تم تثبيت %s"
 
-#: apt-pkg/acquire-worker.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
+msgid "Preparing for removal of %s"
+msgstr "التحضير لإزالة %s"
 
-#: apt-pkg/acquire-worker.cc:452
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "الرجاء إدخال القرص المُسمّى  '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
+msgid "Removed %s"
+msgstr "تم إزالة %s"
 
-#: apt-pkg/init.cc:143
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "نظام الحزم '%s' غير مدعوم"
+msgid "Preparing to completely remove %s"
+msgstr "التحضير لإزالة %s بالكامل"
 
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
+#: apt-pkg/deb/dpkgpm.cc:1010
+#, c-format
+msgid "Completely removed %s"
+msgstr "تمت إزالة %s بالكامل"
+
+#: apt-pkg/deb/dpkgpm.cc:1066
+msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "تعذرت الكتابة إلى %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1069
+msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
+#: apt-pkg/deb/dpkgpm.cc:1090
+msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-pkg/deb/dpkgpm.cc:1568
+msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل"
+#: apt-pkg/deb/dpkgpm.cc:1630
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "تعذرت قراءة قائمة المصادر."
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1635
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: apt-pkg/policy.cc:75
-#, c-format
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
 msgstr ""
 
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+#: apt-pkg/deb/dpkgpm.cc:1643
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
 msgstr ""
 
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
+#: apt-pkg/deb/dpkgpm.cc:1650
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
 msgstr ""
 
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:87
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/deb/dpkgpm.cc:1684
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "تعذر قفل دليل القائمة"
 
-#: apt-pkg/pkgcachegen.cc:251
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:254
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:570
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1199
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
-msgid "Reading package lists"
-msgstr "قراءة قوائم الحزم"
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "تعذر العثور على التحديد %s"
 
-#: apt-pkg/pkgcachegen.cc:1304
-msgid "Collecting File Provides"
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
-msgid "IO Error saving source cache"
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/contrib/fileutl.cc:218
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:154
-#, fuzzy
-msgid "Hash Sum mismatch"
-msgstr "MD5Sum غير متطابقة"
-
-#: apt-pkg/acquire-item.cc:159
-msgid "Size mismatch"
-msgstr "الحجم غير متطابق"
-
-#: apt-pkg/acquire-item.cc:164
-#, fuzzy
-msgid "Invalid file format"
-msgstr "عمليّة غير صالحة %s"
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/contrib/fileutl.cc:223
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-
-#: apt-pkg/acquire-item.cc:1628
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/contrib/fileutl.cc:394
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/contrib/fileutl.cc:412
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/contrib/fileutl.cc:421
 #, c-format
 msgid ""
-"An error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/contrib/fileutl.cc:824
 #, c-format
-msgid "GPG error: %s: %s"
+msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/contrib/fileutl.cc:826
 #, 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)"
+msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/contrib/fileutl.cc:913
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+msgid "Problem closing the gzip file %s"
+msgstr "مشكلة في إغلاق الملف"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "لاحظ، تحديد %s بدلاً من %s\n"
+msgid "Could not open file descriptor %d"
+msgstr "فشل إغلاق الملف %s"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1513
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "read, still have %llu to read but none left"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/contrib/fileutl.cc:1913
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "لاحظ، تحديد %s بدلاً من %s\n"
+msgid "Problem closing the file %s"
+msgstr "مشكلة في إغلاق الملف"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/contrib/fileutl.cc:1925
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+msgid "Problem renaming the file %s to %s"
+msgstr "مشكلة في مزامنة الملف"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "مشكلة في إغلاق الملف"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "مشكلة في مزامنة الملف"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr ""
+msgid "%c%s... Error!"
+msgstr "%c%s... خطأ!"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Using CD-ROM mount point %s\n"
+msgid "%c%s... Done"
+msgstr "%c%s... تمّ"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "فك تركيب القرص المدمج\n"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... تمّ"
 
-#: apt-pkg/cdrom.cc:588
-msgid "Waiting for disc...\n"
-msgstr "بانتظار القرص...\n"
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:597
-msgid "Mounting CD-ROM...\n"
-msgstr "تركيب القرص...\n"
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "جاري التعرف..."
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "تعذر التغيير إلى %s"
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "تعذر فتح %s"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "تعذر إرسال الأمر PORT"
+
+#: apt-pkg/contrib/mmap.cc:290
 #, c-format
-msgid "Stored label: %s\n"
+msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+#: apt-pkg/contrib/mmap.cc:322
 #, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "فك تركيب القرص المدمج..."
+msgid "Failed to truncate file"
+msgstr "فشلت كتابة الملف %s"
 
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/contrib/mmap.cc:446
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/contrib/mmap.cc:449
 msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Found label '%s'\n"
+msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:784
-msgid "That is not a valid name, try again.\n"
-msgstr "هذا الاسم غير صالح، حاول مجدداً.\n"
-
-#: apt-pkg/cdrom.cc:801
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
 msgstr ""
-"هذا القرص مسمى: \n"
-"'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
-msgid "Copying package lists..."
-msgstr "نسخ قوائم الحزم..."
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "اختصار نوع مجهول: '%c'"
 
-#: apt-pkg/cdrom.cc:838
-msgid "Writing new source list\n"
-msgstr "كتابة لائحة المصادر الجديدة\n"
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "فتح ملف التهيئة %s"
 
-#: apt-pkg/cdrom.cc:846
-msgid "Source list entries for this disc are:\n"
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Wrote %i records.\n"
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "MD5Sum غير متطابقة"
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:593
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "تعذر العثور على الحزمة %s"
+msgid "No keyring installed in %s."
+msgstr "إجهاض التثبيت."
 
-#: apt-pkg/cacheset.cc:599
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "تعذر العثور على الحزمة %s"
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "خيار سطر الأمر '%c' [من %s] مجهول."
 
-#: apt-pkg/cacheset.cc:605
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "تعذر العثور على الحزمة %s"
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "خيار سطر الأمر %s غير مفهوم"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
+msgid "Option %s requires an argument."
+msgstr "الخيار %s يتطلّب مُعطى."
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+msgid "Option '%s' is too long"
+msgstr "الخيار '%s' طويل جداً"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "عمليّة غير صالحة %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "تعذر إنشاء %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
 
-#: apt-pkg/install-progress.cc:51
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "قائمة توسيعات الحزمة طويلة جداً"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Error processing directory %s"
+msgstr "خطأ في معالجة الدليل %s"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "قائمة توسيعات المصدر طويلة جداً"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "خطأ في معالجة المحتويات %s"
+
+#: ftparchive/apt-ftparchive.cc:606
 msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+"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 ""
 
-#: apt-pkg/deb/dpkgpm.cc:91
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "تم تثبيت %s"
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "لم تُطابق أية تحديدات"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: ftparchive/apt-ftparchive.cc:890
 #, c-format
-msgid "Configuring %s"
-msgstr "تهيئة %s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: ftparchive/cachedb.cc:51
 #, c-format
-msgid "Removing %s"
-msgstr "إزالة %s"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old"
 
-#: apt-pkg/deb/dpkgpm.cc:94
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "تمت إزالة %s بالكامل"
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "قاعدة البيانات قديمة، محاولة ترقية %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "Noting disappearance of %s"
+msgid "Unable to open DB file %s: %s"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr ""
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: ftparchive/writer.cc:91
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: تعذرت قراءة الدليل %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr ""
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
 #, c-format
-msgid "Directory '%s' missing"
+msgid "Failed to resolve %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "فشل إغلاق الملف %s"
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: ftparchive/writer.cc:219
 #, c-format
-msgid "Preparing %s"
-msgstr "تحضير %s"
+msgid "Failed to open %s"
+msgstr "فشل فتح %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: ftparchive/writer.cc:278
 #, c-format
-msgid "Unpacking %s"
-msgstr "فتح %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: ftparchive/writer.cc:286
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "التحضير لتهيئة %s"
+msgid "Failed to readlink %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: ftparchive/writer.cc:290
 #, c-format
-msgid "Installed %s"
-msgstr "تم تثبيت %s"
+msgid "Failed to unlink %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: ftparchive/writer.cc:298
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "التحضير لإزالة %s"
+msgid "*** Failed to link %s to %s"
+msgstr "*** فشل ربط %s بـ%s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: ftparchive/writer.cc:308
 #, c-format
-msgid "Removed %s"
-msgstr "تم إزالة %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr ""
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "التحضير لإزالة %s بالكامل"
+msgid "  %s has no override entry\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
 #, c-format
-msgid "Completely removed %s"
-msgstr "تمت إزالة %s بالكامل"
+msgid "  %s maintainer is %s not %s\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1046
-msgid "ioctl(TIOCGWINSZ) failed"
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "تعذرت الكتابة إلى %s"
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049
-msgid "Is /dev/pts mounted?"
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - فشل تعيين الذاكرة"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "تعذر فتح %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
-msgid "Is stdout a terminal?"
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
-msgid "Operation was interrupted before it could finish"
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
-msgid "No apport report written because MaxReports is reached already"
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
-msgid "dependency problems - leaving unconfigured"
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "Internal error, failed to create %s"
+msgstr "خطأ داخلي، تعذر إنشاء %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "تعذر قفل دليل القائمة"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr ""
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: ftparchive/multicompress.cc:359
 #, c-format
+msgid "Problem unlinking %s"
+msgstr ""
+
+#: cmdline/apt-internal-solver.cc:46
 msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
-msgid "Not locked"
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "سجل حزمة مجهول!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
 
 #~ msgid "%s not a valid DEB package."
@@ -3330,9 +3362,6 @@ msgstr ""
 #~ msgid "Failed to remove %s"
 #~ msgstr "تعذرت إزالة %s"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "تعذر إنشاء %s"
-
 #~ msgid "Failed to change to the admin dir %sinfo"
 #~ msgstr "فشل تغيير دليل الإدارة إلى %sinfo"
 
diff --git a/po/ast.po b/po/ast.po
index f10324701..c77ecc255 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2010-10-02 23:35+0100\n"
 "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
 "Language-Team: Asturian (ast)\n"
@@ -15,153 +15,154 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Virtaal 0.5.2\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Total de nomes de paquetes: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Total de cadarmes de paquetes: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Paquetes normales: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuales puros: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuales cenciellos: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuales amestaos: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Falten: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Versiones distintes en total: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Descripciones distintes en total: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Dependencies totales: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Rellaciones versión/ficheru en total: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Rellaciones descripción/ficheru en total: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Mapes de provisiones en total: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Cadenes globalizaes en total: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Espaciu de dependencies de versión en total: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Espaciu ociosu en total: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Informe del total d'espaciu: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "El ficheru de paquetes %s nun ta sincronizáu."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Nun s'alcontraron paquetes"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Has de dar polo menos un patrón de gueta"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nun pue alcontrase'l paquete %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Ficheros de paquete:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Paquetes na chincheta:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(nun s'alcontró)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Instaláu: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Candidatu: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(dengún)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Chincheta de paquetes: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Tabla de versiones:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -237,28 +238,28 @@ msgstr ""
 "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:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Da-y un nome a esti discu, como 'Debian 5.0.3 Discu 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 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:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Falló al montar '%s' a '%s'"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repite'l procesu colos demás CDs del conxuntu."
 
@@ -294,65 +295,65 @@ msgstr ""
 "  -c=? Llee esti ficheru de configuración\n"
 "  -o=? Conseña una opción de configuración arbitraria, p. ex.\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Tomando '%s' como paquetes d'oríxenes en llugar de '%s'\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Inorar versión non disponible de '%s' del paquete '%s'"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nun pudo alcontrase'l paquete %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s axustáu como instaláu manualmente.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s axustáu como instaláu automáticamente.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error internu, l'iguador de problemes frañó coses"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Nun pue bloquiase'l direutoriu de descarga"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nun pudo alcontrase un paquete fonte pa %s"
@@ -378,97 +379,97 @@ msgstr ""
 "pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal "
 "paquete.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saltando'l ficheru yá descargáu '%s'\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nun pue determinase l'espaciu llibre de %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nun hai espaciu llibre bastante en %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Hai falta descargar %sB d'archivos fonte.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fonte descargada %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Falló la descarga de dellos archivos."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en mou de sólo descarga"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Falló la orde de desempaquetáu '%s'.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orde build '%s'.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Falló el procesu fíu"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nun tien dependencies de construcción.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -477,7 +478,7 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -486,14 +487,14 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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 "
 "enforma nuevu"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -502,7 +503,7 @@ 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:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -511,30 +512,30 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, 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:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Fallu al procesar les dependencies de construcción"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Coneutando a %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Módulos sofitaos:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -625,53 +626,74 @@ msgstr ""
 "pa más información y opciones.\n"
 "                       Esti APT tien Poderes de Super Vaca.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "pero nun ta instaláu"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s axustáu como instaláu manualmente.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s axustáu como instaláu automáticamente.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s yá ta na versión más nueva.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s yá ta na versión más nueva.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero nun taba ellí"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s axustáu como instaláu manualmente.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Nun pudo abrise %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -698,7 +720,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -746,52 +768,52 @@ msgstr "Nun se pudo desmontar el CD-ROM de %s; puede que se tea usando entá."
 msgid "Disk not found."
 msgstr "Nun s'atopa'l discu."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Nun s'atopa'l ficheru."
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Falló al lleer"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Nun se pudo afitar la hora de modificación"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 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:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Entrando"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Nun se pudo determinar el nome del par"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Nun se pudo determinar el nome llocal"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "El sirvidor refugó la conexón, y dixo: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "L'usuariu (USER) falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "La contraseña (PASS) falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -799,121 +821,123 @@ msgstr ""
 "Especificóse un sirvidor proxy pero non un script d'entrada, Acquire::ftp::"
 "ProxyLogin ta baleru."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, 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:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "La triba (TYPE) falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Gandió'l tiempu de conexón"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "El sirvidor zarró la conexón"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Fallu de llectura"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Una rempuesta revirtió'l buffer."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Corrupción del protocolu"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Fallu d'escritura"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Nun se pudo crear un socket"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 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:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Falló"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Nun se pudo coneutar un socket pasivu."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nun pudo obtener un zócalu oyente"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Nun se pudo enllazar con un socket"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Nun se pudo escuchar nel socket"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Nun se pudo determinar el nome del socket"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Nun se pudo mandar la orde PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Direición de familia %u desconocida (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Gandió'l tiempu de conexón col zócalu de datos"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Nun se pudo aceptar la conexón"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Hebo un problema al xenerar el hash del ficheru"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Gandió'l tiempu del zócalu de datos"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, 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:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Nun se pudo invocar "
 
@@ -949,7 +973,7 @@ 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:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Coneutando a %s"
@@ -979,37 +1003,37 @@ msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Nun pudo coneutase a %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Fallu internu: Robla bona, pero nun se pudo determinar la so buelga dixital?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Atopóse polo menos una robla mala."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Nun pudo executase 'gpgv' pa verificar la robla (¿ta instaláu gpgv?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Fallu desconocíu al executar gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Les siguientes robles nun valieron:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1017,146 +1041,381 @@ msgstr ""
 "Les robles siguientes nun pudieron verificase porque la to llave pública nun "
 "ta a mano:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 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:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Fallu al lleer nel sirvidor"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Falló la escoyeta"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Gandió'l tiempu de conexón"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Fallu al escribir nel ficheru de salida"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Esperando les testeres"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Fallu na llinia testera"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El sirvidor HTTP mandó una testera incorreuta de rempuesta"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Length"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Range"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Formatu de data desconocíu"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Datos de testera incorreutos"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Fallo la conexón"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Fallu internu"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calculando l'anovamientu... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Error internu, AllUpgrade rompió coses"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Fecho"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Iguando dependencies..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falló."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nun pudieron iguase les dependencies"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nun pue amenorgase'l conxuntu d'actualización"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fecho"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Habríes d'executar 'apt-get -f install' para igualo."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencies incumplíes. Téntalo usando -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes nun cumplen dependencies:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "pero %s ta instaláu"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "pero %s ta pa instalar"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "pero nun ye instalable"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "pero ye un paquete virtual"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "pero nun ta instaláu"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "pero nun va instalase"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Van instalase los siguientes paquetes NUEVOS:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Los siguientes paquetes van DESANICIASE:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Los siguientes paquetes tan reteníos:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Los siguientes paquetes van actualizase:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Los siguientes paquetes van DESACTUALIZASE:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Van camudase los siguientes paquetes reteníos:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por %s) "
+
+#: apt-private/private-output.cc:662
+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!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualizaos, %lu nuevos instalaos, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalaos, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualizaos, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error de compilación d'espresión regular - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "La orde update nun lleva argumentos"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error internu, ordenar nun finó"
 
-#: apt-private/private-install.cc:159
-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"
+#: apt-private/private-install.cc:147
+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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Hai que descargar %sB/%sB d'archivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Hai que descargar %sB d'archivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Nun tienes espaciu libre bastante en %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hai problemes y utilizose -y ensin --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Conseñose Trivial Only pero ésta nun ye una operación trivial."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Sí, ¡facer lo que digo!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1167,19 +1426,19 @@ msgstr ""
 "Pa continuar escribe la frase '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Encaboxar."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "¿Quies continuar?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Dellos ficheros nun pudieron descargase"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1187,19 +1446,19 @@ msgstr ""
 "Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o "
 "tentando --fix-missing?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Nun pudieron iguase los paquetes que falten."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Encaboxando la instalación."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1213,15 +1472,15 @@ msgstr[1] ""
 "Los siguientes paquetes desaparecieron del sistema como\n"
 "tolos ficheros fueron sobroescritos por otros paquetes:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: Esto faise automáticamente y baxo demanda por dpkg."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1239,15 +1498,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente información pue aidar a resolver la situación:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error internu, AutoRemover rompió coses"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1258,7 +1517,7 @@ msgstr[1] ""
 "Los siguientes paquetes instaláronse de manera automática y ya nun se "
 "necesiten:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1267,18 +1526,18 @@ msgstr[0] "El paquete %lu instalóse de mou automáticu y yá nun se necesita.\n
 msgstr[1] ""
 "Los paquetes %lu instaláronse de manera automática y ya nun se necesiten\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Usa 'apt-get autoremove' pa desinstalalos."
 msgstr[1] "Usa 'apt-get autoremove' pa desinstalalos."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1286,7 +1545,7 @@ msgstr ""
 "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
 "conseña una solución)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1298,323 +1557,97 @@ msgstr ""
 "inestable, que dellos paquetes necesarios nun se crearon o que\n"
 "s'allugaron fuera d'Incoming."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Paquetes frañaos"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Instalaránse los siguientes paquetes extra:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Paquetes afalaos:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Paquetes encamentaos"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Avisu d'autenticación saltáu.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Dellos paquetes nun pudieron autenticase"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "¿Instalar esos paquetes ensin verificación?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falló algamar %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Los siguientes paquetes nun cumplen dependencies:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "pero %s ta instaláu"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "pero %s ta pa instalar"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "pero nun ye instalable"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "pero ye un paquete virtual"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "pero nun ta instaláu"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "pero nun va instalase"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Van instalase los siguientes paquetes NUEVOS:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Los siguientes paquetes van DESANICIASE:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Los siguientes paquetes tan reteníos:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Los siguientes paquetes van actualizase:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Los siguientes paquetes van DESACTUALIZASE:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Van camudase los siguientes paquetes reteníos:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (por %s) "
-
-#: apt-private/private-output.cc:631
-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!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualizaos, %lu nuevos instalaos, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalaos, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu desactualizaos, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Error de compilación d'espresión regular - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Iguando dependencies..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Nun pudieron iguase les dependencies"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Nun pue amenorgase'l conxuntu d'actualización"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Fecho"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Habríes d'executar 'apt-get -f install' para igualo."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencies incumplíes. Téntalo usando -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "La orde update nun lleva argumentos"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Calculando l'anovamientu... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Error internu, AllUpgrade rompió coses"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Fecho"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Nun pudo renomase %s como %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Oxe "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Des:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Descargaos %sB en %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Tresnando]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1627,19 +1660,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nun ye a lleer %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nun se pudo cambiar a %s"
@@ -1668,11 +1701,11 @@ msgstr "Nun s'alcontró ficheru espeyu '%s'"
 msgid "[Mirror: %s]"
 msgstr "[Espeyu: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Falló criar un tubu IPC al soprocesu"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Conexón encaboxada prematuramente"
 
@@ -1715,1358 +1748,477 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Fusionando información disponible"
 
-#: cmdline/apt-extracttemplates.cc:224
-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:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nun se pue escribir en %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-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:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "La llista d'estensión de paquetes ye enforma llarga"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Error al procesar el direutoriu %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "La llista d'estensión de fontes ye enforma llarga"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Error al escribir la cabecera al ficheru de conteníos"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Error al procesar conteníos %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 desví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:803
-msgid "No selections matched"
-msgstr "Nun concasó denguna seleición"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, 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:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "La BD corrompiose, ficheru renomáu como %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "La DB ye antigua, tentando actualizar %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an 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:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nun pudo abrise'l ficheru de BD %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Nun pudo lleese %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "L'archivu nun tien rexistru de control"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Nun pudo algamase un cursor"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Nun pudo lleese'l direutoriu %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: Nun pudo lleese %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "A: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Errores aplicables al ficheru "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Nun pudo resolvese %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Falló'l percorríu pol árbol"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Nun pudo abrise %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Desenllazar %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Nun pudo lleese l'enllaz %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Nun pudo desenllazase %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Falló enllazar enllazr %s a %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "L'archivu nun tien el campu paquetes"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nun tien la entrada saltos\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  el curiador de %s ye %s y non %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nun tien la entrada saltos de fonte\n"
-
-#: ftparchive/writer.cc:716
-#, 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:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nun pudo allugase memoria"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Nun pudo abrise %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Saltu mal formáu %s llinia %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nun pudo lleese'l ficheru de saltos %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Saltu mal formáu %s llinia %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Saltu mal formáu %s llinia %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Saltu mal formáu %s llinia %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmu de compresión desconocíu '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "La salida comprimida %s necesita un xuegu de compresión"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Nun pudo criase FICHERU*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Nun pudo biforcase"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Comprimir fíu"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Error internu, nun pudo criase %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Fallu na ES al soprocesu/ficheru"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Nun pudo lleese al computar MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema al desenllazar %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Nun pudo renomase %s como %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\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-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "¡Rexistru de paquetes desconocíu!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Fallu al crear les tuberíes"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Fallu al executar gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Ficheru tollíu"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Falló la suma de control de tar, ficheru tollíu"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Testera  del TAR triba %u desconocida, miembru %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Robla del ficheru inválida"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Fallu al lleer la testera de miembru del ficheru"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Testera de miembru del archivu %s inválida"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Testera de miembru del ficheru inválida"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "El ficheru ye perpequeñu"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Falló al lleer les testeres del ficheru"
-
-#: apt-inst/filelist.cc:382
+#: 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:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "¡Fallu al atopar l'elementu enllazáu!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Falló al allugar una desvíu"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Fallu internu en AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: 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:508
+#: 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:551
+#: 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:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Falló la escritura nel ficheru %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Falló al pesllar el ficheru %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "La trayeutoria %s ye enforma llarga"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Desempaquetando %s más d'una vegada"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "El direutorio %s ta desviáu"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, 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:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "La trayeutoria de desviación ye enforma llarga"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Nun pudo lleese %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nun pudo renomase %s como %s"
+
+#: apt-inst/extract.cc:249
 #, 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:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Fallu al atopar el nodu nel so bote d'enllaz"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "La trayeutoria ye perllarga"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, 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
+#: apt-inst/extract.cc:438
 #, 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nun ye a lleer %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Falló la escritura nel ficheru %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Falló al pesllar el ficheru %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, 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:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Error internu, nun se pue atopar el miembru %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Ficheru de control inanalizable"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Nun se puede facer mmap d'un ficheru baleru"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Nun pudo duplicase'l ficheru descriptor %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Nun se pudo facer mmap de %lu bytes"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Nun pudo zarrase mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Nun se pudo sincronizase mmap "
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Nun se pudo facer mmap de %lu bytes"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Falló al francer el ficheru"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-"
-"Start. El valor actual ye : %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Nun pudó incrementase'l tamañu de MMap col llímite de %lu bytes ya torgáu"
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Nun pudó incrementase'l tamañu de MMap ya que crecer automáticamente ta "
-"desactivao pol usuariu."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Escoyeta %s que nun s'atopa"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Triba d'abreviatura que nun se reconoz: «%c»"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Robla del ficheru inválida"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Abriendo ficheros de configuración %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Fallu al lleer la testera de miembru del ficheru"
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-inst/contrib/arfile.cc:96
 #, 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."
+msgid "Invalid archive member header %s"
+msgstr "Testera de miembru del archivu %s inválida"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Fallu de sintaxis %s:%u: Marca mal formada"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Testera de miembru del ficheru inválida"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempués del valor"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "El ficheru ye perpequeñu"
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Falló al lleer les testeres del ficheru"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones añeraes"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Fallu al crear les tuberíes"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equí"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Fallu al executar gzip "
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Ficheru tollíu"
 
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Fallu de sintaxis %s:%u: Directiva llimpia requier un tres opciones como "
-"argumentos"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Falló la suma de control de tar, ficheru tollíu"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-inst/contrib/extracttar.cc:308
 #, 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"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Testera  del TAR triba %u desconocida, miembru %s"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... ¡Fallu!"
+msgid "Unable to stat %s."
+msgstr "Nun pudo lleese %s."
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Fecho"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Fecho"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, 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:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, 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:163
-#, 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:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "La opción %s necesita un argumentu."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, 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:273
-#, 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:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Opción '%s' enforma llarga"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, 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:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Operación incorreuta: %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, 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:225
-msgid "Failed to stat the cdrom"
-msgstr "Nun se pudo montar el CD-ROM"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problemes zarrando'l ficheru gzip %s"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, 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:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Nun puede abrise'l ficheru de bloquéu %s"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Executando dpkt"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/init.cc:146
 #, 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"
+msgid "Packaging system '%s' is not supported"
+msgstr "El sistema d'empaquetáu '%s' nun ta sofitáu"
 
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Nun se pudo torgar %s"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Nun pudo determinase una triba de sistema d'empaquetáu afayadiza"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgid "Wrote %i records.\n"
+msgstr "%i rexistros escritos.\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i rexistros escritos con %i ficheros de menos.\n"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+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/contrib/fileutl.cc:862
-#, 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:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "El subprocesu %s recibió una señal %u."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, 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:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "El subprocesu %s terminó de manera inesperada"
+msgid "Can't find authentication record for: %s"
+msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file %s"
-msgstr "Nun se pudo abrir el ficheru %s"
+msgid "Hash mismatch for: %s"
+msgstr "El hash nun concasa pa: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Nun pudo abrise un ficheru descriptor %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Nun pudo criase'l soprocesu IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Nun pudo executase'l compresor "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada"
+msgid "The method driver %s could not be found."
+msgstr "Nun pudo alncontrase'l controlador de métodu %s."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse"
+msgid "Is the package %s installed?"
+msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "Problemes zarrando'l ficheru %s"
+msgid "Method %s did not start correctly"
+msgstr "El métodu %s nun entamó correchamente"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Hai problemes al renomar el ficheru %s a %s"
+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/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Hai problemes desvenceyando'l ficheru %s"
+#: apt-pkg/cachefile.cc:94
+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/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Hai problemes al sincronizar el ficheru"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Has d'executar apt-get update pa iguar estos problemes"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "L'aniellu de claves nun s'instaló en %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Nun pudo lleese la llista de fontes."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Caché de paquetes balera."
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "El ficheru de caché de paquetes ta tollíu"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 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:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "El ficheru de caché de paquetes ta tollíu"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 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:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Depende de"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Predepende de"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Suxer"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Recomienda"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "En conflictu con"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Sustituye a"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Fai obsoletu a"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Ruempe"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Aumenta"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "requeríu"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencies"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Versiones candidates"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Xeneración de dependencies"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Lleendo información d'estáu"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nun se pudo abrir el ficheru d'estáu %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del ficheru temporal d'estáu %s"
-
-#: apt-pkg/tagfile.cc:138
-#, 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:235
-#, 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:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u 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:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)"
-
-#: apt-pkg/sourcelist.cc:197
-#, 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:199
-#, 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:202
-#, 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:208
-#, 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:215
-#, 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:326
-#, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Llinia %u enforma llarga na llista d'oríxenes %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, 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:366
-#, 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:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Nun pudó facese la configuración inmediatamente en '%s'. Por favor, mira man "
-"5 apt.conf embaxo APT::Immediate-Configure for details. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nun pudo abrise'l ficheru '%s'"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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:34
+#: apt-pkg/pkgrecords.cc:38
 #, 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:266
-#, 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:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola "
-"mor de paquetes reteníos."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Falta'l direutoriu de llistes %spartial."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Falta'l direutoriu d'archivos %spartial."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nun pudo bloquiase'l direutoriu %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Descargando ficheru %li de %li (falten %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Descargando ficheru %li de %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, 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:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El métodu %s nun entamó correchamente"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "El sistema d'empaquetáu '%s' nun ta sofitáu"
-
-#: apt-pkg/init.cc:159
-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:47
-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:87
-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:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Nun pudo lleese la llista de fontes."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-"Rexistru inválidu nel ficheru de preferencies %s, nun hai cabecera Paquete"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Nun s'entiende'l tipu de pin %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Nun hai prioridá (o ye cero) conseñada pa pin"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "La caché tien un sistema de versiones incompatible"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Hebo un error al procesar %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 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:254
+#: apt-pkg/pkgcachegen.cc:260
 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:257
+#: apt-pkg/pkgcachegen.cc:263
 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:260
+#: apt-pkg/pkgcachegen.cc:266
 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:570
+#: apt-pkg/pkgcachegen.cc:576
 #, 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:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, 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:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Lleendo llista de paquetes"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Recoyendo ficheros qu'apurren"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nun se pue escribir en %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Fallu de E/S al grabar caché d'oríxenes"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falló'l cambiu de nome, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "La suma hash nun concasa"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "El tamañu nun concasa"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operación incorreuta: %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nun se pudo parchear el ficheru release %s"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 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:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3076,12 +2228,12 @@ msgstr ""
 "anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Fallu GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3090,12 +2242,12 @@ 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:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3103,71 +2255,134 @@ msgstr ""
 "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
 "paquete %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nun se pudo parchear el ficheru release %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "El bloque de fornidor %s nun contién una buelga dixital"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Ensin seiciones nel ficheru release %s"
+msgid "List directory %spartial is missing."
+msgstr "Falta'l direutoriu de llistes %spartial."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ensin entrada Hash nel ficheru release %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Falta'l direutoriu d'archivos %spartial."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Entrada inválida pa 'Valid-Until' nel ficheru release %s"
+msgid "Unable to lock directory %s"
+msgstr "Nun pudo bloquiase'l direutoriu %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Descargando ficheru %li de %li (falten %s)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "El bloque de fornidor %s nun contién una buelga dixital"
+msgid "Retrieving file %li of %li"
+msgstr "Descargando ficheru %li de %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los "
+"antiguos nel so llugar."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
+"Rexistru inválidu nel ficheru de preferencies %s, nun hai cabecera Paquete"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Nun s'entiende'l tipu de pin %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Nun hai prioridá (o ye cero) conseñada pa pin"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Nun pudó facese la configuración inmediatamente en '%s'. Por favor, mira man "
+"5 apt.conf embaxo APT::Immediate-Configure for details. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nun pudo abrise'l ficheru '%s'"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/packagemanager.cc:577
+#, 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/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Llinia %u enforma llarga na llista d'oríxenes %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Desmontando'l CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, 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:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Desmontando'l CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Esperando'l discu...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Montando'l CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "Identificando.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "Identificando... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etiqueta guardada: %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Desmontando l CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Buscando nel discu ficheros d'índices...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3176,7 +2391,7 @@ msgstr ""
 "Atopáu %zu indices de paquete, %zu indices de fonte, %zu indices de torna y "
 "%zu firmes\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3184,16 +2399,16 @@ msgstr ""
 "Nun s'alcuentra dengún paquete de ficheros, seique nun ye un Discu Debian o "
 "hai una arquiteutura inválida?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Atopóse la etiqueta: '%s'\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 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:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3202,82 +2417,105 @@ msgstr ""
 "Esti discu llámase: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Copiando les llistes de paquetes..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Escribiendo llista nueva d'oríxenes\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 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:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i rexistros escritos.\n"
+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/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i rexistros escritos con %i ficheros de menos.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola "
+"mor de paquetes reteníos."
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencies"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiones candidates"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Xeneración de dependencies"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lleendo información d'estáu"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n"
+msgid "Failed to open StateFile %s"
+msgstr "Nun se pudo abrir el ficheru d'estáu %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, 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"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del ficheru temporal d'estáu %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "El hash nun concasa pa: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Nun s'alcontró la distribución '%s' pa '%s'"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Nun s'alcontró la versión '%s' pa '%s'"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nun pudo alcontrase la xera '%s'"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Nun pueden seleicionase versiones pal paquete'%s' como puramente virtual"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3286,176 +2524,241 @@ msgstr ""
 "Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' "
 "como non tien nengún d'ellos"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Nun puede seleicionase la versión más nueva pal paquete'%s' como puramente "
 "virtual"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Nun puede seleicionase versión candidata pal paquete %s que nun tien "
 "candidata"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Nun puede seleicionase versión instalada pal paquete %s que nun ta instalada"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nun se pudo parchear el ficheru release %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Ensin seiciones nel ficheru release %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ensin entrada Hash nel ficheru release %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Entrada inválida pa 'Valid-Until' nel ficheru release %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u 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:170
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)"
+
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
+"Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
+"Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Executando dpkt"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los "
-"antiguos nel so llugar."
+"Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)"
+
+#: apt-pkg/sourcelist.cc:206
+#, 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:208
+#, 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:211
+#, 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:217
+#, 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:224
+#, 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:335
+#, c-format
+msgid "Opening %s"
+msgstr "Abriendo %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, 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:375
+#, 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:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Desinstalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Desinstalóse dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Anotando desaniciáu de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Executando activador de post-instalación de %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta'l direutoriu '%s'."
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nun pudo abrise'l ficheru '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparándose pa configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s instaláu"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparándose pa desinstalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s desinstaláu"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparándose pa desinstalar dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Desinstalóse dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Nun se pue escribir en %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemes de dependencies - déxase ensin configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3463,7 +2766,7 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que "
 "siguió dende un fallu previu"
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3471,7 +2774,7 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
 "discu llenu"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3479,7 +2782,7 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
 "memoria"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3488,14 +2791,14 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
 "discu llenu"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu E/S "
 "dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3504,14 +2807,14 @@ msgstr ""
 "Nun pudó bloquease'l direutoriu d'alministración (%s), ¿hai otru procesu "
 "usándolu?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nun pudo bloquiase'l direutoriu d'alministración (%s), ¿yes root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3519,10 +2822,741 @@ msgstr ""
 "dpkg interrumpióse, tienes qu'executar manualmente '%s' pa iguar el "
 "problema. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Non bloquiáu"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Escoyeta %s que nun s'atopa"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, 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:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Nun puede abrise'l ficheru de bloquéu %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, 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:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Nun se pudo torgar %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, 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:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "El subprocesu %s recibió una señal %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "El subprocesu %s terminó de manera inesperada"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problemes zarrando'l ficheru gzip %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Nun se pudo abrir el ficheru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nun pudo abrise un ficheru descriptor %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Nun pudo criase'l soprocesu IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Nun pudo executase'l compresor "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problemes zarrando'l ficheru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Hai problemes al renomar el ficheru %s a %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Hai problemes desvenceyando'l ficheru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Hai problemes al sincronizar el ficheru"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... ¡Fallu!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Fecho"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Fecho"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Nun se puede facer mmap d'un ficheru baleru"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Nun pudo duplicase'l ficheru descriptor %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Nun se pudo facer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Nun pudo zarrase mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Nun se pudo sincronizase mmap "
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nun se pudo facer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Falló al francer el ficheru"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-"
+"Start. El valor actual ye : %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Nun pudó incrementase'l tamañu de MMap col llímite de %lu bytes ya torgáu"
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Nun pudó incrementase'l tamañu de MMap ya que crecer automáticamente ta "
+"desactivao pol usuariu."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, 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:246
+msgid "Failed to stat the cdrom"
+msgstr "Nun se pudo montar el CD-ROM"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Triba d'abreviatura que nun se reconoz: «%c»"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Abriendo ficheros de configuración %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Fallu de sintaxis %s:%u: Marca mal formada"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equí"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, 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:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Fallu de sintaxis %s:%u: Directiva llimpia requier un tres opciones como "
+"argumentos"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, 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"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "L'aniellu de claves nun s'instaló en %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, 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:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, 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:168
+#, 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:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "La opción %s necesita un argumentu."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, 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:278
+#, 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:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opción '%s' enforma llarga"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, 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:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Operación incorreuta: %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nun ye a lleer %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+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:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "La llista d'estensión de paquetes ye enforma llarga"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Error al procesar el direutoriu %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "La llista d'estensión de fontes ye enforma llarga"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Error al escribir la cabecera al ficheru de conteníos"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Error al procesar conteníos %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 desví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:812
+msgid "No selections matched"
+msgstr "Nun concasó denguna seleición"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, 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:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "La BD corrompiose, ficheru renomáu como %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "La DB ye antigua, tentando actualizar %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an 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:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nun pudo abrise'l ficheru de BD %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "L'archivu nun tien rexistru de control"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Nun pudo algamase un cursor"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Nun pudo lleese'l direutoriu %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "A: Nun pudo lleese %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "A: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Errores aplicables al ficheru "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Nun pudo resolvese %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Falló'l percorríu pol árbol"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Nun pudo abrise %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " Desenllazar %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Nun pudo lleese l'enllaz %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Nun pudo desenllazase %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Falló enllazar enllazr %s a %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "L'archivu nun tien el campu paquetes"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s nun tien la entrada saltos\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  el curiador de %s ye %s y non %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s nun tien la entrada saltos de fonte\n"
+
+#: ftparchive/writer.cc:725
+#, 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:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Nun pudo allugase memoria"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nun pudo abrise %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Saltu mal formáu %s llinia %lu #1"
+
+#: 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/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Saltu mal formáu %s llinia %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Saltu mal formáu %s llinia %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Saltu mal formáu %s llinia %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmu de compresión desconocíu '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "La salida comprimida %s necesita un xuegu de compresión"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Nun pudo criase FICHERU*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Nun pudo biforcase"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Comprimir fíu"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Error internu, nun pudo criase %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Fallu na ES al soprocesu/ficheru"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Nun pudo lleese al computar MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problema al desenllazar %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\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-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "¡Rexistru de paquetes desconocíu!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s nun ye un paquete DEB válidu."
 
diff --git a/po/bg.po b/po/bg.po
index 9bc639d8c..a644953f0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2012-06-25 17:23+0300\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -21,153 +21,154 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Пакетът %s версия %s има неудовлетворена зависимост:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Общо имена на пакети : "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Общо пакетни структури: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Нормални пакети: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Чисти виртуални пакети: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Единични виртуални пакети: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Смесени виртуални пакети: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Липсващи: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Общо уникални версии: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Общо уникални описания: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Общо зависимости: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Общо отношения версия/файл: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Общо отношения описание/файл: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Общо отношения „Осигурява“: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Общо разгърнати низове: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Общо пространство за зависимости по версии: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Общо празно пространство: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Общо отчетено пространство: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Пакетният файл %s не е синхронизиран."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Няма намерени пакети"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Трябва да въведете поне един шаблон за търсене"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Тази командата е остаряла. Използвайте „apt-mark showauto“ вместо нея."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Пакетът %s не може да бъде намерен"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Пакетни файлове:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Отбити пакети:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(не са намерени)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Инсталирана: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(няма)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Отбиване на пакета: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Таблица с версиите:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s за %s компилиран на %s %s\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -238,28 +239,28 @@ msgstr ""
 "cache=/tmp\n"
 "За повече информация вижте наръчниците apt-cache(8) и apt.conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Укажете име за този диск, например „Debian 5.0.3 Disk1“"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Сложете диск в устройството и натиснете „Enter“"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Неуспех при монтиране на %s на %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Повторете този процес за останалите дискове от комплекта."
 
@@ -296,47 +297,47 @@ msgstr ""
 "  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Използване на пакет източник „%s“ вместо „%s“\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Игнориране на несъществуваща версия „%s“ на пакета „%s“"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Неуспех при намирането на пакет %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s е отбелязан като ръчно инсталиран.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s е отбелязан като автоматично инсталиран.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -344,19 +345,19 @@ msgstr ""
 "Тази команда е остаряла. Вместо нея използвайте „apt-mark auto“ и „apt-mark "
 "manual“."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Неуспех при заключването на директорията за изтегляне"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неуспех при намирането на изходен код на пакет %s"
@@ -383,80 +384,80 @@ msgstr ""
 "за да изтеглите последните промени в пакета (евентуално в процес на "
 "разработка).\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускане на вече изтегления файл „%s“\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Неуспех при определянето на свободното пространство в %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Нямате достатъчно свободно пространство в %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Изтегляне на изходен код %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Неуспех при изтеглянето на някои архиви."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Изтеглянето завърши в режим само на изтегляне"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Командата за разпакетиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Командата за компилиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Процесът-потомък пропадна"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -465,18 +466,18 @@ msgstr ""
 "Липсва информация за архитектурата %s. Прегледайте информацията за APT::"
 "Architectures в apt.conf(5)."
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Неуспех при получаването на информация за зависимостите за компилиране на %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s няма зависимости за компилиране.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,7 +486,7 @@ msgstr ""
 "Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява "
 "за пакети „%s“"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -494,14 +495,14 @@ msgstr ""
 "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "не може да бъде намерен"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
 "пакет %s е твърде нов"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -510,7 +511,7 @@ msgstr ""
 "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията "
 "кандидат на пакета %s не може да удовлетвори изискването за версия"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -519,30 +520,30 @@ msgstr ""
 "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "няма подходящи версии"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Неуспех при обработката на зависимостите за компилиране"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Журнал на промените в %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Поддържани модули:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -632,53 +633,74 @@ msgstr ""
 "информация и опции.\n"
 "                           Това APT има Върховни Сили.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "Пакетът „%s“ не може да бъде маркиран, защото не е инсталиран.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "Пакетът „%s“ вече е отбелязан като ръчно инсталиран.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "Пакетът „%s“ вече е отбелязан като автоматично инсталиран.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "Пакетът „%s“ вече е задуржан.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "Пакетът „%s“ вече е задържан.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Изчака се завършването на %s, но той не беше пуснат"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "Пакетът „%s“ е задържан.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Отмяна на задържането на пакета „%s“.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Неуспех при изпълняване на dpkg. Имате ли административни права?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -725,7 +747,7 @@ msgstr ""
 "  -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n"
 "За повече информация прегледайте ръководствата apt-mark(8) и apt.conf(5)."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -773,52 +795,52 @@ msgstr "Неуспех при демонтирането на CD-ROM в %s, мо
 msgid "Disk not found."
 msgstr "Дискът не е намерен."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Файлът не е намерен"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Неуспех при получаването на атрибути"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Неуспех при задаването на време на промяна"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Невалиден адрес-URI, локалните адреси-URI не трябва да започват с „//“"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Влизане"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Неуспех при установяването на името на отдалечения сървър"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Неуспех при установяването на локалното име"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Сървърът отказа свързване и съобщи: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -826,123 +848,125 @@ msgstr ""
 "Беше указан сървър-посредник, но няма скрипт за влизане, Acquire::ftp::"
 "ProxyLogin е празен."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Командата „%s“ на скрипта за влизане се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Допустимото време за свързването изтече"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Сървърът разпадна връзката"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Грешка при четене"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Отговорът препълни буфера."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Развален протокол"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Грешка при запис"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Неуспех при създаването на гнездо"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Неуспех при свързването на гнездо за данни, допустимото време за свързване "
 "изтече"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Неуспех"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Неуспех при свързването на пасивно гнездо."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo не успя да се добере до слушащо гнездо"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Неуспех при свързването на гнездо"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Неуспех при слушането на гнездото"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Неуспех при определянето на името на гнездото"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Неуспех при изпращането на командата PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Неизвестно семейство адреси %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Времето за установяване на връзка с гнездо за данни изтече"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Невъзможно е да се приеме свързването"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Проблем при хеширане на файла"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Неуспех при изтеглянето на файла, сървърът съобщи „%s“"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Времето за връзка с гнездо за данни изтече"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Неуспех при прехвърлянето на данни, сървърът съобщи: „%s“"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Запитване"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Неуспех при извикването на "
 
@@ -978,7 +1002,7 @@ msgstr "Неуспех при свързване с %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Свързване с %s"
@@ -1008,40 +1032,40 @@ msgstr "Нещо лошо се случи при намирането на IP а
 msgid "Unable to connect to %s:%s:"
 msgstr "Неуспех при свързване с %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
 "ключа?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Намерен е поне един невалиден подпис."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е "
 "gpgv?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Неизвестна грешка при изпълнението на gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Следните подписи са невалидни:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1049,116 +1073,352 @@ msgstr ""
 "Следните подписи не можаха да бъдат проверени, защото публичния ключ не е "
 "наличен:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Празни файлове не могат да бъдат валидни архиви"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Грешка при записа на файла"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Грешка при четене от сървъра"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Грешка при записа на файл"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Неуспех на избора"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Допустимото време за свързване изтече"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Грешка при записа на изходен файл"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Чакане на заглавни части"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Невалиден ред на заглавна част"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Неизвестен формат на дата"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Невалидни данни на заглавната част"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Неуспех при свързването"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Изчисляване на актуализацията..."
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Готово"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Коригиране на зависимостите..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " пропадна."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Неуспех при коригирането на зависимостите"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Неуспех при минимизирането на набора актуализации"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Готово"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
+"неизправности."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Следните пакети имат неудовлетворени зависимости:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "но е инсталиран %s"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "но ще бъде инсталиран %s"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "но той не може да бъде инсталиран"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "но той е виртуален пакет"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "но той не е инсталиран"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "но той няма да бъде инсталиран"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " или"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Следните пакети няма да бъдат променени:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Следните пакети ще бъдат актуализирани:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Следните задържани пакети ще бъдат променени:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (поради %s) "
+
+#: apt-private/private-output.cc:662
+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"
+"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu актуализирани, %lu нови инсталирани, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu преинсталирани, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu върнати към по-стара версия, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu за премахване и %lu без промяна.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu не са напълно инсталирани или премахнати.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Грешка при компилирането на регулярния израз - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Командата „update“ не възприема аргументи"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Вътрешна грешка, „Ordering“ не завърши"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
-"Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org"
+"Странно... Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Необходимо е да се изтеглят %sB архиви.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1167,31 +1427,31 @@ msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Нямате достатъчно свободно пространство в %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Указано е „Trivial Only“, но това не е тривиална операция."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Да, прави каквото казвам!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1202,19 +1462,19 @@ msgstr ""
 "За да продължите, въведете фразата „%s“\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Прекъсване."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Искате ли да продължите?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Някои файлове не можаха да бъдат изтеглени"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1222,19 +1482,19 @@ msgstr ""
 "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ "
 "или да опитате с „--fix-missing“?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "„--fix-missing“ и превключване на носители не се поддържа все още"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Неуспех при коригирането на липсващите пакети."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Прекъсване на инсталирането."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1248,15 +1508,15 @@ msgstr[1] ""
 "Следните пакети са отстранени от системата поради препокриване на всичките "
 "им файлове от други пакети:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Това се прави автоматично от dpkg."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1274,16 +1534,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Следната информация може да помогне за намиране на изход от ситуацията:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1293,7 +1553,7 @@ msgstr[0] "Следният пакет е бил инсталиран автом
 msgstr[1] ""
 "Следните пакети са били инсталирани автоматично и вече не са необходими:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1302,17 +1562,17 @@ msgstr[0] "%lu пакет е бил инсталиран автоматично
 msgstr[1] ""
 "%lu пакета са били инсталирани автоматично и вече не са необходими:\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Използвайте „apt-get autoremove“ за да го премахнете."
 msgstr[1] "Използвайте „apt-get autoremove“ за да ги премахнете."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1320,7 +1580,7 @@ msgstr ""
 "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
 "укажете разрешение)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1332,324 +1592,96 @@ msgstr ""
 "дистрибуция, че някои необходими пакети още не са създадени или пък\n"
 "са били преместени от Incoming."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Счупени пакети"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Предложени пакети:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Препоръчвани пакети:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"Забележка: това е само симулация!\n"
+"           apt-get има нужда от административни права за да работи.\n"
+"           Заключването е деактивирано, така че не разчитайте\n"
+"           на повтаряемост в реална ситуация."
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Предупреждението за удостоверяването е пренебрегнато.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Някои пакети не можаха да бъдат удостоверени"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Инсталиране на тези пакети без проверка?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Неуспех при изтеглянето на %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Следните пакети имат неудовлетворени зависимости:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "но е инсталиран %s"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "но ще бъде инсталиран %s"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "но той не може да бъде инсталиран"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "но той е виртуален пакет"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "но той не е инсталиран"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "но той няма да бъде инсталиран"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " или"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Следните пакети няма да бъдат променени:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Следните пакети ще бъдат актуализирани:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Следните задържани пакети ще бъдат променени:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (поради %s) "
-
-#: apt-private/private-output.cc:631
-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"
-"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu актуализирани, %lu нови инсталирани, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu преинсталирани, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu върнати към по-стара версия, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu за премахване и %lu без промяна.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu не са напълно инсталирани или премахнати.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Грешка при компилирането на регулярния израз - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Коригиране на зависимостите..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " пропадна."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Неуспех при коригирането на зависимостите"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Неуспех при минимизирането на набора актуализации"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
-"неизправности."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Командата „update“ не възприема аргументи"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Изчисляване на актуализацията..."
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Готово"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"Забележка: това е само симулация!\n"
-"           apt-get има нужда от административни права за да работи.\n"
-"           Заключването е деактивирано, така че не разчитайте\n"
-"           на повтаряемост в реална ситуация."
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Неуспех при преименуването на %s на %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Поп "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Изт:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Игн "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Грш "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Изтеглени %sB за %s (%sB/сек)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [В процес на работа]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1662,19 +1694,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Неуспех при четенето на %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Неуспех при преминаването в %s"
@@ -1703,11 +1735,11 @@ msgstr "Грешка при четене файла „%s“ от огледал
 msgid "[Mirror: %s]"
 msgstr "[Огледален сървър: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Неуспех при създаването на IPC pipe към подпроцеса"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Връзката прекъсна преждевременно"
 
@@ -1747,1351 +1779,454 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Смесване на наличната информация"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Употреба: apt-extracttemplates файл1 [файл2 ...]\n"
-"\n"
-"apt-extracttemplates е инструмент за извличане на конфигурационна "
-"информация\n"
-"и шаблони от дебиански пакети\n"
-"\n"
-"Опции:\n"
-"  -h   Този помощен текст.\n"
-"  -t   Настройване на временна директория\n"
-"  -c=? Четене на този конфигурационен файл.\n"
-"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Неуспех при записа на %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Списъкът с разширения на пакети и твърде дълъг"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Грешка при обработката на директория %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Списъкът с разширения на източници е твърде дълъг"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Грешка при запазването на заглавната част във файла със съдържание"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Грешка при обработката на съдържание %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Употреба: apt-ftparchive [опции] команда\n"
-"Команди:  packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents път\n"
-"          release път\n"
-"          generate config [групи]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive генерира индексни файлове за архиви на Дебиан. Поддържа\n"
-"много стилове на генериране от напълно автоматично до функционални\n"
-"замени на dpkg-scanpackages и dpkg-scansources.\n"
-"\n"
-"apt-ftparchive генерира „Package“ файлове от дърво с .deb файлове. Файлът\n"
-"„Package“ представлява съдържанието на всички контролни полета на всеки\n"
-"пакет, както и MD5 хеш и размер на файла. Стойностите на полетата \n"
-"„Priority“ и „Section“ могат да бъдат изменени с файл „override“.\n"
-"\n"
-"По подобен начин apt-ftparchive генерира „Sources“ файлове от дърво с .dsc \n"
-"файлове. Опцията --source-override може да се използва за указване на файл\n"
-"„override“ за пакети с изходен код.\n"
-"\n"
-"Командите „packages“ и „sources“ трябва да се изпълняват в корена на "
-"дървото.\n"
-"BinaryPath трябва да сочи към основата, където започва рекурсивното търсене "
-"и\n"
-"файла „override“ трябва да съдържа всички флагове за преназначаване. "
-"Pathprefix\n"
-"се прибавя към полетата на файловите имена, ако съществува. Пример за "
-"употреба\n"
-"от архива на Дебиан:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Опции:\n"
-"  -h    Този помощен текст.\n"
-"  --md5 Управление на генерирането на MD5.\n"
-"  -s=?  Файл „override“ за пакети с изходен код.\n"
-"  -q    Без показване на съобщения.\n"
-"  -d=?  Избор на допълнителна база от данни за кеширане.\n"
-"  --no-delink Включване на режим за премахване на връзки.\n"
-"  --contents  Управление на генерирането на файлове със съдържание.\n"
-"  -c=?  Четене на този конфигурационен файл.\n"
-"  -o=?  Настройване на произволна конфигурационна опция"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Няма съвпадения на избора"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Липсват някои файлове от групата с файлови пакети „%s“"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "БД е повредена, файлът е преименуван на %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "БД е стара, опит за актуализиране на %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Невалиден формат на БД.  Ако сте обновили от по-стара версия на apt, "
-"премахнете базата от данни и я създайте наново."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Неуспех при отварянето на файл %s от БД: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Грешка при получаването на атрибути за %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "В архива няма поле „control“"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Неуспех при получаването на курсор"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Неуспех при четенето на директория %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Неуспех при четенето на %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Грешките се отнасят за файла "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Неуспех при превръщането на %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Неуспех при обхода на дървото"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Неуспех при отварянето на %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Неуспех при прочитането на връзка %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Неуспех при премахването на връзка %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Неуспех при създаването на връзка %s към %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "Превишен лимит на DeLink от %sB.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Архивът няма поле „package“"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s няма запис „override“\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  поддържащия пакета %s е %s, а не %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s няма запис „source override“\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s няма също и запис „binary override“\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Неуспех при заделянето на памет"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Неуспех при отварянето на %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Неправилно форматиран override %s, ред %llu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Неуспех при четенето на override файл %s"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Неправилно форматиран override %s, ред %llu #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Неправилно форматиран override %s, ред %llu #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Неправилно форматиран override %s, ред %llu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Непознат алгоритъм за компресия „%s“"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Компресираният изход %s изисква настройка за компресирането"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Неуспех при създаването на FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Неуспех при пускането на подпроцес"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Процес-потомък за компресиране"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Вътрешна грешка, неуспех при създаването на %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "В/И към подпроцеса/файла пропадна"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Неуспех при четене докато се изчислява MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Неуспех при премахването на връзка на %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Неуспех при преименуването на %s на %s"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Употреба: apt-internal-solver\n"
-"\n"
-"apt-internal-solver е интерфейс към вградения в APT механизъм за "
-"удовлетворяване на зависимости\n"
-"\n"
-"Опции:\n"
-"  -h  Този помощен текст\n"
-"  -q  Изход, подходящ за журнал — без индикатор на напредъка\n"
-"  -c=? Указване на файл с настройки\n"
-"  -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Непознат запис за пакет!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Употреба: apt-sortpkgs [опции] файл1 [файл2 ...]\n"
-"\n"
-"apt-sortpkgs е опростен инструмент за сортиране на пакетни файлове. Опцията\n"
-"„-s“ се използва, за да покаже типа на файла.\n"
-"\n"
-"Опции:\n"
-"  -h   Този помощен текст.\n"
-"  -s   Използване на сортиране по изходен код.\n"
-"  -c=? Четене на този конфигурационен файл.\n"
-"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
-"tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Неуспех при създаването на програмни канали"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Неуспех при изпълнението на gzip"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Развален архив"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Невярна контролна сума на tar, развален архив"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Непозната заглавна част на TAR тип %u, елемент %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Невалиден подпис на архива"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Грешка при четене на заглавната част на елемента на архива"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Невалидна заглавна част %s на елемента на архива"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Невалидна заглавна част на елемента на архива"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Архивът е твърде кратък"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Неуспех при четенето на заглавните части на архива"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "Извикан е DropNode за все още използван възел"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Грешка при намирането на хеш-елемента!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Неуспех при установяване на отклонението"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Вътрешна грешка в AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Двойно добавяне на отклонение %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Дублиран конфигурационен файл %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Неуспех при запис на файл %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Неуспех при затварянето на файл %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Пътят %s е твърде дълъг"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Разпакетиране на %s повече от веднъж"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Директорията %s е отклонена"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Пътят за отклонение е твърде дълъг"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Грешка при получаването на атрибути за %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Неуспех при преименуването на %s на %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Директорията %s се заменя с не-директория"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Неуспех при намирането на възел в неговия хеш"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Пътят е твърде дълъг"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Файловете се заменят със съдържанието на пакета %s без версия"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Файл %s/%s заменя този в пакет %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Неуспех при получаването на атрибути за %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Неуспех при запис на файл %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Неуспех при затварянето на файл %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Това не е валиден DEB архив, липсва елемент „%s“"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Контролен файл, невъзможен за анализ"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Невъзможно е да се прехвърли в паметта празен файл"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Неуспех при дублиране на файлов манипулатор %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Неуспех при прехвърлянето в паметта на %llu байта"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Неуспех при затваряне на mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Неуспех при синхронизирането на mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Неуспех при прехвърлянето в паметта на %lu байта"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Неуспех при отрязване на края на файла"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Недостатъчна памет за MMap. Увеличете стойността на променливата APT::Cache-"
-"Start. Текуща стойност: %lu (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Неуспех при увеличаване на паметта за MMap. Достигнато е текущото "
-"ограничение от %lu байта."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Неуспех при увеличаване на паметта за MMap. Автоматичното увеличаване е "
-"забранено от потребителя."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liч %liм %liс"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%liм %liс"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%liс"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Изборът %s не е намерен"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Неизвестен тип на абревиатура: „%c“"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Невалиден подпис на архива"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Отваряне на конфигурационен файл %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Грешка при четене на заглавната част на елемента на архива"
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Синтактична грешка %s:%u: В началото на блока няма име."
+msgid "Invalid archive member header %s"
+msgstr "Невалидна заглавна част %s на елемента на архива"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Синтактична грешка %s:%u: Лошо форматиран таг"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Невалидна заглавна част на елемента на архива"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Синтактична грешка %s:%u: Излишни символи след стойността"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Архивът е твърде кратък"
 
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-"Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното "
-"ниво"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Неуспех при четенето на заглавните части на архива"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Неуспех при създаването на програмни канали"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Неуспех при изпълнението на gzip"
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Развален архив"
 
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Синтактична грешка %s:%u: директивата clear изисква  аргумент дърво от опции"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Невярна контролна сума на tar, развален архив"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Непозната заглавна част на TAR тип %u, елемент %s"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Грешка!"
+msgid "Unable to stat %s."
+msgstr "Неуспех при получаването на атрибути на %s."
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Готово"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Готово"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Неизвестна опция за команден ред „%c“ [от %s]."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Опцията за команден ред %s не е разпозната"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Опцията за команден ред %s не е булева"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Опция %s изисква аргумент."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Опция %s: Значението трябва да има =<val>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Опция %s изисква аргумент цяло число, не „%s“"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Изпълняване на dpkg"
 
-#: apt-pkg/contrib/cmndline.cc:304
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Опция „%s“ е твърде дълга"
+msgid "Packaging system '%s' is not supported"
+msgstr "Пакетната система „%s“ не е поддържана"
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Смисълът %s не е ясен, опитайте true или false."
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Неуспех при определянето на подходяща пакетна система"
 
-#: apt-pkg/contrib/cmndline.cc:386
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Invalid operation %s"
-msgstr "Невалидна операция %s"
+msgid "Wrote %i records.\n"
+msgstr "Записани са %i записа.\n"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Неуспех при намирането на атрибутите на cdrom"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Записани са %i записа с %i липсващи файла.\n"
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Проблем при затваряне на компресираният файл %s (gzip)"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Записани са %i записа с %i несъответстващи файла\n"
 
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-"Не се използва заключване за файл за заключване %s, който е само за четене"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open lock file %s"
-msgstr "Неуспех при отварянето на файл за заключване %s"
+msgid "Can't find authentication record for: %s"
+msgstr "Не е намерен oторизационен запис за: %s"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Не се използва заключване за файл за заключване %s, който е монтиран по NFS"
+msgid "Hash mismatch for: %s"
+msgstr "Несъответствие на контролната сума за: %s"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not get lock %s"
-msgstr "Неуспех при достъпа до заключване %s"
+msgid "The method driver %s could not be found."
+msgstr "Неуспех при намирането на драйвер за метод %s."
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Не може да се създаде списък от файлове, защото „%s“ не е директория"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Пропускане на „%s“ в директорията „%s“, понеже не е обикновен файл"
+msgid "Method %s did not start correctly"
+msgstr "Методът %s не стартира правилно"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "Пропускане на файла „%s“ в директорията „%s“, понеже няма разширение"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"Пропускане на файла „%s“ в директорията „%s“, понеже разширението му е грешно"
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Под-процесът %s получи сигнал %u."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Подпроцесът %s върна код за грешка (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Подпроцесът %s завърши неочаквано"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Неуспех при отварянето на файла %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Неуспех при отварянето на файлов манипулатор %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Неуспех при създаването на подпроцес IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Неуспех при изпълнението на компресиращата програма "
+"Списъците с пакети или файлът за състояние не можаха да бъдат анализирани "
+"или отворени."
 
-#: apt-pkg/contrib/fileutl.cc:1326
-#, c-format
-msgid "read, still have %llu to read but none left"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
-"грешка при четене, все още има %llu за четене, но няма нито един останал"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "грешка при запис, все още име %llu за запис, но не успя"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "Проблем при затваряне на файла %s"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Проблем при преименуване на файла %s на %s"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Проблем при изтриване на файла %s"
-
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Проблем при синхронизиране на файла"
+"Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "В %s няма инсталиран ключодържател."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Списъкът с източници не можа да бъде прочетен."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Празен кеш на пакети"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Файлът за кеш на пакети е повреден"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Файлът за кеш на пакети е несъвместима версия"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Файлът за кеш на пакети е повреден, твърде малък е"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Тази версия на APT не поддържа система за версии „%s“"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Кешът на пакети е бил направен за различна архитектура"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Зависи от"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Предварително зависи от"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Предлага се"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Препоръчва се"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "В конфликт с"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Заменя"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Изважда от употреба"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Чупи"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Подобрява"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "важен"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "изискван"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "стандартен"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "незадължителен"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "допълнителен"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Изграждане на дървото със зависимости"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Версии кандидати"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Генериране на зависимости"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Четене на информацията за състоянието"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Неуспех при отварянето на StateFile %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Неуспех при запис на временен StateFile %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Неуспех при анализирането на пакетен файл %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Неуспех при анализирането на пакетен файл %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма "
-"стойност)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Отваряне на %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Ред %u в списъка с източници %s е твърде дълъг."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Неуспех при незабавната настройка на „%s“. За повече информация вижте "
-"информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Неуспех при конфигуриране на „%s“. "
-
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"В следствие на циклични зависимости от типа „В конфликт с/Предварително "
-"зависи от“, за да се продължи инсталацията трябва да се премахне необходимия "
-"пакет %s. Това често е лошо, но ако наистина искате да го направите, "
-"активирайте опцията APT::Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Не се поддържа индексен файл от типа „%s“"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за "
-"него."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
-"причинено от задържани пакети."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Неуспех при коригирането на проблемите, имате задържани счупени пакети."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Директорията със списъци %spartial липсва."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Директорията за архиви %spartial липсва."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Неуспех при заключване на директорията %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Изтегляне на файл %li от %li (остават %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Изтегляне на файл %li от %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Неуспех при намирането на драйвер за метод %s."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Методът %s не стартира правилно"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Пакетната система „%s“ не е поддържана"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Неуспех при определянето на подходяща пакетна система"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Неуспех при получаването на атрибути на %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Списъците с пакети или файлът за състояние не можаха да бъдат анализирани "
-"или отворени."
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Списъкът с източници не можа да бъде прочетен."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"Стойността „%s“ на APT::Default-Release не е правилна, понеже в източниците "
-"няма такова издание"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Невалиден запис във файла с настройки %s, липсва заглавна част Package"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Неизвестен тип за отбиване %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Няма указан приоритет (или е нула) на отбиването"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Кешът има несъвместима система за версии"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Възникна грешка при обработката на %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Четене на списъците с пакети"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Събиране на информация за „Осигурява“"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Неуспех при записа на %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Подготовка за приемане на решение"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Външната програма за удовлетворяване на зависимости се провали без да изведе "
+"съобщение за грешка"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "преименуването се провали, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Несъответствие на контролната сума"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Несъответствие на размера"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Невалидна операция %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3100,16 +2235,16 @@ msgstr ""
 "Не може да се открие елемент „%s“ във файла Release (объркан ред в sources."
 "list или повреден файл)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Не е открита контролна сума за „%s“  във файла Release"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3118,12 +2253,12 @@ msgstr ""
 "Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се "
 "прилагат обновявания от това хранилище."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3133,12 +2268,12 @@ msgstr ""
 "използват старите индексни файлове. Грешка от GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Грешка от GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3147,83 +2282,147 @@ msgstr ""
 "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
 "ръчно да оправите този пакет (поради пропусната архитектура)."
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Неуспех при анализиране на файл Release %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Блокът на производителя %s не съдържа отпечатък"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Във файла Release %s липсват раздели"
+msgid "List directory %spartial is missing."
+msgstr "Директорията със списъци %spartial липсва."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Във файла Release %s липсва контролна сума"
+msgid "Archives directory %spartial is missing."
+msgstr "Директорията за архиви %spartial липсва."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
+msgid "Unable to lock directory %s"
+msgstr "Неуспех при заключване на директорията %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Неправилна стойност за „Date“ във файла Release %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Изтегляне на файл %li от %li (остават %s)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Блокът на производителя %s не съдържа отпечатък"
+msgid "Retrieving file %li of %li"
+msgstr "Изтегляне на файл %li от %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Някои индексни файлове не можаха да бъдат изтеглени. Те са пренебрегнати или "
+"са използвани по-стари."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"Стойността „%s“ на APT::Default-Release не е правилна, понеже в източниците "
+"няма такова издание"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Невалиден запис във файла с настройки %s, липсва заглавна част Package"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Неизвестен тип за отбиване %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Няма указан приоритет (или е нула) на отбиването"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Неуспех при незабавната настройка на „%s“. За повече информация вижте "
+"информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Неуспех при конфигуриране на „%s“. "
+
+#: apt-pkg/packagemanager.cc:577
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"В следствие на циклични зависимости от типа „В конфликт с/Предварително "
+"зависи от“, за да се продължи инсталацията трябва да се премахне необходимия "
+"пакет %s. Това често е лошо, но ако наистина искате да го направите, "
+"активирайте опцията APT::Force-LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Ред %u в списъка с източници %s е твърде дълъг."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Демонтиране на CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Използване на точка за монтиране на CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Демонтиране на CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Чакане за диск...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Монтиране на CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Идентифициране..."
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Запазен етикет: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Демонтиране на CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Сканиране на диска за индексни файлове...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3232,7 +2431,7 @@ msgstr ""
 "Намерени са %zu индекса на пакети, %zu индекса на пакети с изходен код, %zu "
 "индекса с преводи и %zu подписа.\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3240,16 +2439,16 @@ msgstr ""
 "Не са намерени файлове с пакети. Мое би дискът не е с Дебиан или е за "
 "погрешна компютърна архитектура."
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Намерен е етикет „%s“\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Това не е валидно име, опитайте отново.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3258,79 +2457,106 @@ msgstr ""
 "Наименование на този диск: \n"
 "„%s“\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Копиране на списъците с пакети..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Запазване на новия списък с източници\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Записите в списъка с източници за този диск са:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Записани са %i записа.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за "
+"него."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Записани са %i записа с %i липсващи файла.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
+"причинено от задържани пакети."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Неуспех при коригирането на проблемите, имате задържани счупени пакети."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Изграждане на дървото със зависимости"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версии кандидати"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Генериране на зависимости"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Четене на информацията за състоянието"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Записани са %i записа с %i несъответстващи файла\n"
+msgid "Failed to open StateFile %s"
+msgstr "Неуспех при отварянето на StateFile %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Неуспех при запис на временен StateFile %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Не е намерен oторизационен запис за: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Неуспех при анализирането на пакетен файл %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Несъответствие на контролната сума за: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Неуспех при анализирането на пакетен файл %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Не е намерено издание „%s“ на „%s“"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Не е намерена версия „%s“ на „%s“"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Неуспех при намиране на задача „%s“"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3339,180 +2565,248 @@ msgstr ""
 "Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ "
 "понеже той няма нито едната"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Не е възможно избиране на на последната версия за пакета „%s“, защото е "
 "виртуален"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма "
 "подходящ кандидати"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Не е възможно избиране на инсталирана версия на пакета „%s“, защото не е "
 "инсталиран"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Неуспех при анализиране на файл Release %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Във файла Release %s липсват раздели"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Подготовка за приемане на решение"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Във файла Release %s липсва контролна сума"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Неправилна стойност за „Date“ във файла Release %s"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
+
+#: apt-pkg/sourcelist.cc:170
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
-"Външната програма за удовлетворяване на зависимости се провали без да изведе "
-"съобщение за грешка"
+"Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Изпълняване на dpkg"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Някои индексни файлове не можаха да бъдат изтеглени. Те са пренебрегнати или "
-"са използвани по-стари."
+"Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма "
+"стойност)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Отваряне на %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Инсталиране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Конфигуриране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Окончателно премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Отбелязване на изчезването на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Изпълнение на тригер след инсталиране %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Директорията „%s“ липсва"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Неуспех при отваряне на файла „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Подготвяне на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Разпакетиране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Подготвяне на %s за конфигуриране"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s е инсталиран"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Подготвяне за премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s е премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Подготовка за пълно премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s е напълно премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Неуспех при записа на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "Операцията е прекъсната"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Поради достигане на максималния брой доклади (MaxReports) не е записан нов "
 "доклад за зависимостите."
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "отлагане на настройката поради неудовлетворени зависимости"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3520,7 +2814,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото съобщението за грешка е породено "
 "от друга грешка."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3528,7 +2822,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото грешката е причинена от "
 "недостатъчно дисково пространство"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3536,7 +2830,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото грешката е причинена от "
 "недостатъчна оперативна памет"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3545,13 +2839,13 @@ msgstr ""
 "Доклад за зависимостите не е записан защото грешката е причинена от "
 "недостатъчно дисково пространство"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Доклад за зависимостите не е записан поради входно-изходна грешка с dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3560,7 +2854,7 @@ msgstr ""
 "Неуспех при заключване на административната директория (%s). Може би се "
 "използва от друг процес?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3569,7 +2863,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3577,10 +2871,749 @@ msgstr ""
 "Процесът dpkg е беше прекъснат. Проблемът трябва да се коригира чрез ръчно "
 "изпълнение на „%s“."
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Без заключване"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liч %liм %liс"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%liм %liс"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%liс"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Изборът %s не е намерен"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+"Не се използва заключване за файл за заключване %s, който е само за четене"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Неуспех при отварянето на файл за заключване %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"Не се използва заключване за файл за заключване %s, който е монтиран по NFS"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Неуспех при достъпа до заключване %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "Не може да се създаде списък от файлове, защото „%s“ не е директория"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "Пропускане на „%s“ в директорията „%s“, понеже не е обикновен файл"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr "Пропускане на файла „%s“ в директорията „%s“, понеже няма разширение"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"Пропускане на файла „%s“ в директорията „%s“, понеже разширението му е грешно"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Под-процесът %s получи сигнал %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Подпроцесът %s върна код за грешка (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Подпроцесът %s завърши неочаквано"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Проблем при затваряне на компресираният файл %s (gzip)"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Неуспех при отварянето на файла %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Неуспех при отварянето на файлов манипулатор %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Неуспех при създаването на подпроцес IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Неуспех при изпълнението на компресиращата програма "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr ""
+"грешка при четене, все още има %llu за четене, но няма нито един останал"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "грешка при запис, все още име %llu за запис, но не успя"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Проблем при затваряне на файла %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Проблем при преименуване на файла %s на %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Проблем при изтриване на файла %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Проблем при синхронизиране на файла"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Грешка!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Готово"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Готово"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Невъзможно е да се прехвърли в паметта празен файл"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Неуспех при дублиране на файлов манипулатор %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Неуспех при прехвърлянето в паметта на %llu байта"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Неуспех при затваряне на mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Неуспех при синхронизирането на mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Неуспех при прехвърлянето в паметта на %lu байта"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Неуспех при отрязване на края на файла"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Недостатъчна памет за MMap. Увеличете стойността на променливата APT::Cache-"
+"Start. Текуща стойност: %lu (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Неуспех при увеличаване на паметта за MMap. Достигнато е текущото "
+"ограничение от %lu байта."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Неуспех при увеличаване на паметта за MMap. Автоматичното увеличаване е "
+"забранено от потребителя."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Неуспех при намирането на атрибутите на cdrom"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Неизвестен тип на абревиатура: „%c“"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Отваряне на конфигурационен файл %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Синтактична грешка %s:%u: В началото на блока няма име."
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Синтактична грешка %s:%u: Лошо форматиран таг"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Синтактична грешка %s:%u: Излишни символи след стойността"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното "
+"ниво"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Синтактична грешка %s:%u: директивата clear изисква  аргумент дърво от опции"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "В %s няма инсталиран ключодържател."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Неизвестна опция за команден ред „%c“ [от %s]."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Опцията за команден ред %s не е разпозната"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Опцията за команден ред %s не е булева"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Опция %s изисква аргумент."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Опция %s: Значението трябва да има =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Опция %s изисква аргумент цяло число, не „%s“"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Опция „%s“ е твърде дълга"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Смисълът %s не е ясен, опитайте true или false."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Невалидна операция %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Употреба: apt-extracttemplates файл1 [файл2 ...]\n"
+"\n"
+"apt-extracttemplates е инструмент за извличане на конфигурационна "
+"информация\n"
+"и шаблони от дебиански пакети\n"
+"\n"
+"Опции:\n"
+"  -h   Този помощен текст.\n"
+"  -t   Настройване на временна директория\n"
+"  -c=? Четене на този конфигурационен файл.\n"
+"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Неуспех при получаването на атрибути за %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Списъкът с разширения на пакети и твърде дълъг"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Грешка при обработката на директория %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Списъкът с разширения на източници е твърде дълъг"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Грешка при запазването на заглавната част във файла със съдържание"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Грешка при обработката на съдържание %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Употреба: apt-ftparchive [опции] команда\n"
+"Команди:  packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents път\n"
+"          release път\n"
+"          generate config [групи]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive генерира индексни файлове за архиви на Дебиан. Поддържа\n"
+"много стилове на генериране от напълно автоматично до функционални\n"
+"замени на dpkg-scanpackages и dpkg-scansources.\n"
+"\n"
+"apt-ftparchive генерира „Package“ файлове от дърво с .deb файлове. Файлът\n"
+"„Package“ представлява съдържанието на всички контролни полета на всеки\n"
+"пакет, както и MD5 хеш и размер на файла. Стойностите на полетата \n"
+"„Priority“ и „Section“ могат да бъдат изменени с файл „override“.\n"
+"\n"
+"По подобен начин apt-ftparchive генерира „Sources“ файлове от дърво с .dsc \n"
+"файлове. Опцията --source-override може да се използва за указване на файл\n"
+"„override“ за пакети с изходен код.\n"
+"\n"
+"Командите „packages“ и „sources“ трябва да се изпълняват в корена на "
+"дървото.\n"
+"BinaryPath трябва да сочи към основата, където започва рекурсивното търсене "
+"и\n"
+"файла „override“ трябва да съдържа всички флагове за преназначаване. "
+"Pathprefix\n"
+"се прибавя към полетата на файловите имена, ако съществува. Пример за "
+"употреба\n"
+"от архива на Дебиан:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Опции:\n"
+"  -h    Този помощен текст.\n"
+"  --md5 Управление на генерирането на MD5.\n"
+"  -s=?  Файл „override“ за пакети с изходен код.\n"
+"  -q    Без показване на съобщения.\n"
+"  -d=?  Избор на допълнителна база от данни за кеширане.\n"
+"  --no-delink Включване на режим за премахване на връзки.\n"
+"  --contents  Управление на генерирането на файлове със съдържание.\n"
+"  -c=?  Четене на този конфигурационен файл.\n"
+"  -o=?  Настройване на произволна конфигурационна опция"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Няма съвпадения на избора"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Липсват някои файлове от групата с файлови пакети „%s“"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "БД е повредена, файлът е преименуван на %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "БД е стара, опит за актуализиране на %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Невалиден формат на БД.  Ако сте обновили от по-стара версия на apt, "
+"премахнете базата от данни и я създайте наново."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Неуспех при отварянето на файл %s от БД: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "В архива няма поле „control“"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Неуспех при получаването на курсор"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Неуспех при четенето на директория %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Неуспех при четенето на %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Грешките се отнасят за файла "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Неуспех при превръщането на %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Неуспех при обхода на дървото"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Неуспех при отварянето на %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr "DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Неуспех при прочитането на връзка %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Неуспех при премахването на връзка %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Неуспех при създаването на връзка %s към %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "Превишен лимит на DeLink от %sB.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Архивът няма поле „package“"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s няма запис „override“\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  поддържащия пакета %s е %s, а не %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s няма запис „source override“\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s няма също и запис „binary override“\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Неуспех при заделянето на памет"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Неуспех при отварянето на %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Неправилно форматиран override %s, ред %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Неуспех при четенето на override файл %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Неправилно форматиран override %s, ред %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Неправилно форматиран override %s, ред %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Неправилно форматиран override %s, ред %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Непознат алгоритъм за компресия „%s“"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Компресираният изход %s изисква настройка за компресирането"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Неуспех при създаването на FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Неуспех при пускането на подпроцес"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Процес-потомък за компресиране"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Вътрешна грешка, неуспех при създаването на %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "В/И към подпроцеса/файла пропадна"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Неуспех при четене докато се изчислява MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Неуспех при премахването на връзка на %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Употреба: apt-internal-solver\n"
+"\n"
+"apt-internal-solver е интерфейс към вградения в APT механизъм за "
+"удовлетворяване на зависимости\n"
+"\n"
+"Опции:\n"
+"  -h  Този помощен текст\n"
+"  -q  Изход, подходящ за журнал — без индикатор на напредъка\n"
+"  -c=? Указване на файл с настройки\n"
+"  -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Непознат запис за пакет!"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Употреба: apt-sortpkgs [опции] файл1 [файл2 ...]\n"
+"\n"
+"apt-sortpkgs е опростен инструмент за сортиране на пакетни файлове. Опцията\n"
+"„-s“ се използва, за да покаже типа на файла.\n"
+"\n"
+"Опции:\n"
+"  -h   Този помощен текст.\n"
+"  -s   Използване на сортиране по изходен код.\n"
+"  -c=? Четене на този конфигурационен файл.\n"
+"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
+"tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s не е валиден DEB пакет."
 
diff --git a/po/bs.po b/po/bs.po
index b5d611697..bca1b3b0e 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -15,155 +15,156 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Normalni paketi:"
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Pojedinačni virutuelni paketi:"
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Miješani virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Nedostajući:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Ukupno zavisnosti:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Paketi nisu pronađeni"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ne mogu pronaći paket %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Instalirano:"
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -200,28 +201,28 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -257,65 +258,65 @@ msgstr ""
 "  -c=? Pročitaj ovu konfiguracijsku datoteku\n"
 "  -o=? Podesi odgovarajuću konfiguracijsku opciju, npr. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
@@ -335,151 +336,151 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -525,53 +526,73 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ali nije instaliran"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Ne mogu otvoriti %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -598,7 +619,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -646,173 +667,175 @@ msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi."
 msgid "Disk not found."
 msgstr "Datoteka nije pronađena"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Datoteka nije pronađena"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr ""
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Prijavljujem se"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr ""
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Server je zatvorio vezu"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Greška pri čitanju"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 #, fuzzy
 msgid "Protocol corruption"
 msgstr "Oštećenje protokola"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Greška pri pisanju"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Neuspješno"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr ""
 
@@ -848,7 +871,7 @@ msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se sa %s"
@@ -878,470 +901,299 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Čekam na zaglavlja"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr ""
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
-#: apt-private/private-list.cc:147
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-install.cc:93
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: apt-private/private-install.cc:102
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-
-#: apt-private/private-install.cc:121
-msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr ""
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr ""
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Računam nadogradnju..."
 
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
 msgstr ""
 
-#: apt-private/private-install.cc:211
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr ""
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Urađeno"
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
-msgid "There are problems and -y was used without --force-yes"
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
-msgid "Trivial Only specified but this is not a trivial operation."
+#: apt-private/private-list.cc:131
+msgid "Listing"
 msgstr ""
 
-#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
-#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
-msgid "Yes, do as I say!"
-msgstr "Da, uradi kako kažem!"
-
-#: apt-private/private-install.cc:233
+#: apt-private/private-list.cc:164
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
-msgid "Abort."
-msgstr "Odustani."
-
-#: apt-private/private-install.cc:254
-msgid "Do you want to continue?"
-msgstr "Da li želite nastaviti?"
-
-#: apt-private/private-install.cc:324
-msgid "Some files failed to download"
-msgstr ""
-
-#: apt-private/private-install.cc:331
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-
-#: apt-private/private-install.cc:335
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-
-#: apt-private/private-install.cc:340
-msgid "Unable to correct missing packages."
-msgstr ""
-
-#: apt-private/private-install.cc:341
-msgid "Aborting install."
-msgstr "Odustajem od instalacije."
-
-#: apt-private/private-install.cc:377
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
+msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:381
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:402
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:510
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::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.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: apt-private/private-install.cc:517
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
-
-#: apt-private/private-install.cc:524
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
-msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
-
-#: apt-private/private-install.cc:528
-#, fuzzy, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
-msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
-
-#: apt-private/private-install.cc:530
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+"There are %i additional versions. Please use the '-a' switch to see them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:624
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-
-#: apt-private/private-install.cc:626
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Ispravljam zavisnosti..."
 
-#: apt-private/private-install.cc:639
-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."
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
 msgstr ""
 
-#: apt-private/private-install.cc:660
-msgid "Broken packages"
-msgstr "Oštećeni paketi"
-
-#: apt-private/private-install.cc:713
-msgid "The following extra packages will be installed:"
-msgstr "Slijedeći dodatni paketi će biti instalirani:"
-
-#: apt-private/private-install.cc:803
-msgid "Suggested packages:"
-msgstr "Predloženi paketi:"
-
-#: apt-private/private-install.cc:804
-msgid "Recommended packages:"
-msgstr "Preporučeni paketi:"
-
-#: apt-private/private-download.cc:32
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "Slijedeći paketi će biti nadograđeni:"
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ne mogu ispraviti zavisnosti"
 
-#: apt-private/private-download.cc:36
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
-msgid "Some packages could not be authenticated"
-msgstr ""
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Urađeno"
 
-#: apt-private/private-download.cc:46
-msgid "Install these packages without verification?"
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr ""
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:201
+#: apt-private/private-output.cc:232
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr "[Instalirano]"
 
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:236
 #, fuzzy
 msgid "[installed,local]"
 msgstr "[Instalirano]"
 
-#: apt-private/private-output.cc:208
+#: apt-private/private-output.cc:239
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:210
+#: apt-private/private-output.cc:241
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr "[Instalirano]"
 
-#: apt-private/private-output.cc:212
+#: apt-private/private-output.cc:243
 #, fuzzy
 msgid "[installed]"
 msgstr "[Instalirano]"
 
-#: apt-private/private-output.cc:216
+#: apt-private/private-output.cc:247
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:220
+#: apt-private/private-output.cc:251
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:320
+#: apt-private/private-output.cc:351
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: apt-private/private-output.cc:410
+#: apt-private/private-output.cc:441
 #, c-format
 msgid "but %s is installed"
 msgstr "ali je %s instaliran"
 
-#: apt-private/private-output.cc:412
+#: apt-private/private-output.cc:443
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ali se %s treba instalirati"
 
-#: apt-private/private-output.cc:419
+#: apt-private/private-output.cc:450
 msgid "but it is not installable"
 msgstr "ali se ne može instalirati"
 
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:452
 msgid "but it is a virtual package"
 msgstr "ali je virtuelni paket"
 
-#: apt-private/private-output.cc:424
+#: apt-private/private-output.cc:455
 msgid "but it is not installed"
 msgstr "ali nije instaliran"
 
-#: apt-private/private-output.cc:424
+#: apt-private/private-output.cc:455
 msgid "but it is not going to be installed"
 msgstr "ali se neće instalirati"
 
-#: apt-private/private-output.cc:429
+#: apt-private/private-output.cc:460
 msgid " or"
 msgstr " ili"
 
-#: apt-private/private-output.cc:458
+#: apt-private/private-output.cc:489
 msgid "The following NEW packages will be installed:"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 
-#: apt-private/private-output.cc:484
+#: apt-private/private-output.cc:515
 msgid "The following packages will be REMOVED:"
 msgstr "Slijedeći paketi će biti UKLONJENI:"
 
-#: apt-private/private-output.cc:506
+#: apt-private/private-output.cc:537
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Slijedeći paketi su zadržani:"
 
-#: apt-private/private-output.cc:527
+#: apt-private/private-output.cc:558
 msgid "The following packages will be upgraded:"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: apt-private/private-output.cc:548
+#: apt-private/private-output.cc:579
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: apt-private/private-output.cc:568
+#: apt-private/private-output.cc:599
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: apt-private/private-output.cc:623
+#: apt-private/private-output.cc:654
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: apt-private/private-output.cc:631
+#: apt-private/private-output.cc:662
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:693
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: apt-private/private-output.cc:666
+#: apt-private/private-output.cc:697
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:699
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: apt-private/private-output.cc:670
+#: apt-private/private-output.cc:701
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:674
+#: apt-private/private-output.cc:705
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
@@ -1350,7 +1202,7 @@ msgstr ""
 #. e.g. "Do you want to continue? [Y/n] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:727
 msgid "[Y/n]"
 msgstr ""
 
@@ -1358,90 +1210,243 @@ msgstr ""
 #. e.g. "Should this file be removed? [y/N] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:733
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:744
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
+#: apt-private/private-output.cc:750
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Ispravljam zavisnosti..."
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
 
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Ne mogu ispraviti zavisnosti"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
 
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Urađeno"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr ""
 
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr ""
 
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
 msgstr ""
 
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Računam nadogradnju..."
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr ""
 
-#: apt-private/private-upgrade.cc:24
-msgid "Internal error, Upgrade broke stuff"
+#: apt-private/private-install.cc:199
+#, c-format
+msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Urađeno"
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
 
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: apt-private/private-show.cc:152
+#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
+#. careful with hard to type or special characters (like non-breaking spaces)
+#: apt-private/private-install.cc:219
+msgid "Yes, do as I say!"
+msgstr "Da, uradi kako kažem!"
+
+#: apt-private/private-install.cc:221
 #, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+msgid "Abort."
+msgstr "Odustani."
+
+#: apt-private/private-install.cc:242
+msgid "Do you want to continue?"
+msgstr "Da li želite nastaviti?"
+
+#: apt-private/private-install.cc:312
+msgid "Some files failed to download"
+msgstr ""
+
+#: apt-private/private-install.cc:319
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: apt-private/private-install.cc:323
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+
+#: apt-private/private-install.cc:328
+msgid "Unable to correct missing packages."
+msgstr ""
+
+#: apt-private/private-install.cc:329
+msgid "Aborting install."
+msgstr "Odustajem od instalacije."
+
+#: apt-private/private-install.cc:365
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
 msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
+#: apt-private/private-install.cc:369
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-main.cc:19
+#: apt-private/private-install.cc:390
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: apt-private/private-install.cc:498
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::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.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+
+#: apt-private/private-install.cc:505
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: apt-private/private-install.cc:512
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
+msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
+
+#: apt-private/private-install.cc:516
+#, fuzzy, c-format
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
+msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
+
+#: apt-private/private-install.cc:518
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:612
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+
+#: apt-private/private-install.cc:614
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+
+#: apt-private/private-install.cc:627
+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 ""
+
+#: apt-private/private-install.cc:648
+msgid "Broken packages"
+msgstr "Oštećeni paketi"
+
+#: apt-private/private-install.cc:701
+msgid "The following extra packages will be installed:"
+msgstr "Slijedeći dodatni paketi će biti instalirani:"
+
+#: apt-private/private-install.cc:791
+msgid "Suggested packages:"
+msgstr "Predloženi paketi:"
+
+#: apt-private/private-install.cc:792
+msgid "Recommended packages:"
+msgstr "Preporučeni paketi:"
+
+#: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1449,43 +1454,69 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-sources.cc:45
+#: apt-private/private-download.cc:31
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Slijedeći paketi će biti nadograđeni:"
+
+#: apt-private/private-download.cc:35
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: apt-private/private-download.cc:45
+msgid "Install these packages without verification?"
+msgstr ""
+
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr ""
+
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr ""
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr ""
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr ""
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr ""
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr ""
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1495,19 +1526,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ne mogu čitati %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
@@ -1536,11 +1567,11 @@ msgstr "Ne mogu otvoriti %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr ""
 
@@ -1578,1682 +1609,1683 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sastavljam dostupne informacije"
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ne mogu zapisati na %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr ""
-"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:597
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr ""
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB je stara, pokušavam nadogradnju %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
 
-#: ftparchive/cachedb.cc:81
-#, fuzzy, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Arhiva nema kontrolnog zapisa"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
 msgstr ""
 
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: ftparchive/writer.cc:87
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr ""
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr ""
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to resolve %s"
-msgstr ""
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Ne mogu otvoriti %s"
-
-#: ftparchive/writer.cc:269
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:277
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
+msgid "The path %s is too long"
 msgstr ""
 
-#: ftparchive/writer.cc:281
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
+msgid "Unpacking %s more than once"
 msgstr ""
 
-#: ftparchive/writer.cc:289
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
+msgid "The directory %s is diverted"
 msgstr ""
 
-#: ftparchive/writer.cc:299
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr ""
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
 msgstr ""
 
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
+msgid "Failed to stat %s"
 msgstr ""
 
-#: ftparchive/writer.cc:712
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:716
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr ""
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr ""
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Putanja je preduga"
 
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Failed to read the override file %s"
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: ftparchive/override.cc:163
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu #1"
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: ftparchive/override.cc:175
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Malformed override %s line %llu #2"
+msgid "Unable to stat %s"
 msgstr ""
 
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr ""
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "Ne mogu ukloniti %s"
 
-#: ftparchive/multicompress.cc:71
+#: apt-inst/dirstream.cc:105
 #, c-format
-msgid "Unknown compression algorithm '%s'"
+msgid "Failed to close file %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:101
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr ""
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr ""
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr ""
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: ftparchive/multicompress.cc:230
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Internal error, failed to create %s"
+msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
 msgstr ""
 
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
 msgstr ""
 
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
 msgstr ""
 
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Failed to rename %s to %s"
+msgid "Invalid archive member header %s"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Nepoznat zapis paketa\""
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arhiva je prekratka"
 
-#: cmdline/apt-sortpkgs.cc:153
-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"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:122
+#: apt-inst/contrib/extracttar.cc:124
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:149
+#: apt-inst/contrib/extracttar.cc:151
 msgid "Failed to exec gzip "
 msgstr "Ne mogu izvršiti gzip"
 
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
 msgid "Corrupted archive"
 msgstr "Oštećena arhiva"
 
-#: apt-inst/contrib/extracttar.cc:201
+#: apt-inst/contrib/extracttar.cc:203
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
 
-#: apt-inst/contrib/extracttar.cc:306
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:94
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Invalid archive member header %s"
+msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arhiva je prekratka"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-inst/filelist.cc:382
-msgid "DropNode called on still linked node"
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-inst/filelist.cc:414
-msgid "Failed to locate the hash element!"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-inst/filelist.cc:461
-msgid "Failed to allocate diversion"
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#, c-format
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:466
-msgid "Internal error in AddDiversion"
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:479
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:508
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Double add of diversion %s -> %s"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:551
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Duplicate conf file %s/%s"
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "Ne mogu ukloniti %s"
-
-#: apt-inst/dirstream.cc:106
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Failed to close file %s"
+msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "The path %s is too long"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-inst/extract.cc:125
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Unpacking %s more than once"
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-inst/extract.cc:135
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "The directory %s is diverted"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-inst/extract.cc:145
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
-msgid "The diversion path is too long"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-inst/extract.cc:242
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-inst/extract.cc:282
-msgid "Failed to locate node in its hash bucket"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-inst/extract.cc:286
-msgid "The path is too long"
-msgstr "Putanja je preduga"
-
-#: apt-inst/extract.cc:414
-#, c-format
-msgid "Overwrite package match with no version for %s"
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
 msgstr ""
 
-#: apt-inst/extract.cc:431
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-inst/extract.cc:491
-#, c-format
-msgid "Unable to stat %s"
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-pkg/pkgcache.cc:174
 #, c-format
-msgid "Internal error, could not locate member %s"
+msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:219
-msgid "Unparsable control file"
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr ""
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Zavisi"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Unaprijed zavisi"
 
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Predlaže"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Ne mogu kreirati %s"
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Preporučuje"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/pkgcache.cc:322
 #, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Ne mogu kreirati %s"
+msgid "Conflicts"
+msgstr "Sukobljava se sa"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Zamjenjuje"
 
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Ne mogu ukloniti %s"
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Zastarijeva"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "važno"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "zahtijevano"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standardno"
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr ""
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opcionalno"
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr ""
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
 
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Selection %s not found"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:617
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
-msgid "Opening configuration file %s"
+msgid "Error occurred while processing %s (%s%d)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:868
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
+msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr ""
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Čitam spiskove paketa"
 
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr ""
+msgid "Unable to write to %s"
+msgstr "Ne mogu zapisati na %s"
 
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
-msgid "Command line option %s is not boolean"
+msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:304
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
-msgid "Option '%s' is too long"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
+#: apt-pkg/acquire-item.cc:1595
+#, fuzzy, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: apt-pkg/acquire-item.cc:1637
+msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:386
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
-msgid "Invalid operation %s"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
-msgid "Unable to stat the mount point %s"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
+#: apt-pkg/acquire-item.cc:1727
+#, c-format
+msgid ""
+"An error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:95
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
-msgid "Problem closing the gzip file %s"
+msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
-msgid "Not using locking for read only lock file %s"
+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/contrib/fileutl.cc:233
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
-msgid "Could not open lock file %s"
+msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Could not get lock %s"
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
+msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Ne mogu kreirati %s"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
+#: apt-pkg/acquire.cc:901
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Čitam spisak datoteke"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
 msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "Sub-process %s received signal %u."
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/policy.cc:422
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
+msgid "Did not understand pin type %s"
+msgstr ""
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
 #, c-format
-msgid "Could not open file %s"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Could not open file descriptor %d"
+msgid "Could not configure '%s'. "
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "read, still have %llu to read but none left"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
-msgid "write, still have %llu to write but couldn't"
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Ne mogu ukloniti %s"
+#: apt-pkg/cdrom.cc:571
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "Pogrešan CD"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/cdrom.cc:586
 #, c-format
-msgid "Problem renaming the file %s to %s"
+msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr ""
+#: apt-pkg/cdrom.cc:599
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Čekam na zaglavlja"
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
+#: apt-pkg/cdrom.cc:609
+msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Odustajem od instalacije."
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:148
-msgid "Empty package cache"
+#: apt-pkg/cdrom.cc:662
+#, c-format
+msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:154
-msgid "The package cache file is corrupted"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:159
-msgid "The package cache file is an incompatible version"
+#: apt-pkg/cdrom.cc:734
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:162
-msgid "The package cache file is corrupted, it is too small"
+#: apt-pkg/cdrom.cc:744
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/cdrom.cc:771
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
+msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:172
-msgid "The package cache was built for a different architecture"
+#: apt-pkg/cdrom.cc:800
+msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:314
-msgid "Depends"
-msgstr "Zavisi"
-
-#: apt-pkg/pkgcache.cc:314
-msgid "PreDepends"
-msgstr "Unaprijed zavisi"
-
-#: apt-pkg/pkgcache.cc:314
-msgid "Suggests"
-msgstr "Predlaže"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Recommends"
-msgstr "Preporučuje"
+#: apt-pkg/cdrom.cc:817
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/cdrom.cc:819
 #, fuzzy
-msgid "Conflicts"
-msgstr "Sukobljava se sa"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Replaces"
-msgstr "Zamjenjuje"
-
-#: apt-pkg/pkgcache.cc:316
-msgid "Obsoletes"
-msgstr "Zastarijeva"
+msgid "Copying package lists..."
+msgstr "Čitam spiskove paketa"
 
-#: apt-pkg/pkgcache.cc:316
-msgid "Breaks"
+#: apt-pkg/cdrom.cc:863
+msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:316
-msgid "Enhances"
+#: apt-pkg/cdrom.cc:874
+msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
-msgid "important"
-msgstr "važno"
-
-#: apt-pkg/pkgcache.cc:327
-msgid "required"
-msgstr "zahtijevano"
-
-#: apt-pkg/pkgcache.cc:327
-msgid "standard"
-msgstr "standardno"
+#: apt-pkg/algorithms.cc:265
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:328
-msgid "optional"
-msgstr "opcionalno"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:328
-msgid "extra"
-msgstr "extra"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
 msgid "Building dependency tree"
 msgstr "Gradim stablo zavisnosti"
 
-#: apt-pkg/depcache.cc:133
+#: apt-pkg/depcache.cc:139
 msgid "Candidate versions"
 msgstr "Verzije kandidata"
 
-#: apt-pkg/depcache.cc:162
+#: apt-pkg/depcache.cc:168
 msgid "Dependency generation"
 msgstr "Stvaranje zavisnosti"
 
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
 #, fuzzy
 msgid "Reading state information"
 msgstr "Sastavljam dostupne informacije"
 
-#: apt-pkg/depcache.cc:244
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/depcache.cc:256
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/tagfile.cc:138
+#: apt-pkg/tagfile.cc:140
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:235
+#: apt-pkg/tagfile.cc:237
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:118
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: apt-pkg/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:161
+#: apt-pkg/sourcelist.cc:170
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:173
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:175
+#: apt-pkg/sourcelist.cc:184
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:181
+#: apt-pkg/sourcelist.cc:190
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/sourcelist.cc:193
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:197
+#: apt-pkg/sourcelist.cc:206
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:208
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:211
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:217
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:215
+#: apt-pkg/sourcelist.cc:224
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:326
+#: apt-pkg/sourcelist.cc:335
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:362
+#: apt-pkg/sourcelist.cc:371
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:366
+#: apt-pkg/sourcelist.cc:375
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:407
+#: apt-pkg/sourcelist.cc:416
 #, c-format
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:95
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "  Instalirano:"
 
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Ne mogu otvoriti %s"
+msgid "Configuring %s"
+msgstr "Povezujem se sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/packagemanager.cc:570
+#: apt-pkg/deb/dpkgpm.cc:99
 #, 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."
+msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:266
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:989
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/deb/dpkgpm.cc:990
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Otvaram %s"
 
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
-msgid "List directory %spartial is missing."
+msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/acquire.cc:85
+#: apt-pkg/deb/dpkgpm.cc:997
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "  Instalirano:"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
-msgid "Archives directory %spartial is missing."
+msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/acquire.cc:93
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Ne mogu kreirati %s"
+msgid "Removed %s"
+msgstr "Preporučuje"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
+msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/acquire.cc:895
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, fuzzy, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Čitam spisak datoteke"
+msgid "Completely removed %s"
+msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
+#: apt-pkg/deb/dpkgpm.cc:1066
+msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:115
-#, c-format
-msgid "Is the package %s installed?"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Ne mogu zapisati na %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1069
+msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
+#: apt-pkg/deb/dpkgpm.cc:1090
+msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+#: apt-pkg/deb/dpkgpm.cc:1568
+msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
+#: apt-pkg/deb/dpkgpm.cc:1630
+msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1635
+msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
+#: apt-pkg/deb/dpkgpm.cc:1637
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
+#: apt-pkg/deb/dpkgpm.cc:1643
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-pkg/deb/dpkgpm.cc:1650
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
+#: apt-pkg/deb/dpkgpm.cc:1684
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/policy.cc:75
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
 
-#: apt-pkg/policy.cc:414
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 
-#: apt-pkg/policy.cc:436
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Did not understand pin type %s"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:87
-msgid "Cache has an incompatible versioning system"
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:251
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:254
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/contrib/fileutl.cc:195
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/contrib/fileutl.cc:218
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
-msgid "Reading package lists"
-msgstr "Čitam spiskove paketa"
-
-#: apt-pkg/pkgcachegen.cc:1304
-msgid "Collecting File Provides"
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
-msgid "IO Error saving source cache"
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/contrib/fileutl.cc:394
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:154
-msgid "Hash Sum mismatch"
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:159
-msgid "Size mismatch"
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:164
-msgid "Invalid file format"
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/contrib/fileutl.cc:826
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: apt-pkg/acquire-item.cc:1628
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/contrib/fileutl.cc:913
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/contrib/fileutl.cc:1101
 #, c-format
-msgid ""
-"An error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
+msgid "Could not open file %s"
 msgstr ""
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
-#, c-format
-msgid "GPG error: %s: %s"
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
-#, 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)"
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/contrib/fileutl.cc:1513
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/contrib/fileutl.cc:1913
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
+msgid "Problem closing the file %s"
+msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/contrib/fileutl.cc:1925
 #, c-format
-msgid "No sections in Release file %s"
+msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/contrib/fileutl.cc:1936
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Problem unlinking the file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:144
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
+msgid "%c%s... Error!"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Using CD-ROM mount point %s\n"
+msgid "%c%s... Done"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:588
-#, fuzzy
-msgid "Waiting for disc...\n"
-msgstr "Čekam na zaglavlja"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, c-format
+msgid "%c%s... %u%%"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:597
-msgid "Mounting CD-ROM...\n"
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/contrib/mmap.cc:119
 #, c-format
-msgid "Stored label: %s\n"
+msgid "Couldn't make mmap of %llu bytes"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+#: apt-pkg/contrib/mmap.cc:146
 #, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "Pogrešan CD"
+msgid "Unable to close mmap"
+msgstr "Ne mogu kreirati %s"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Ne mogu kreirati %s"
 
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/contrib/mmap.cc:341
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
 msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Found label '%s'\n"
+msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:784
-msgid "That is not a valid name, try again.\n"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
+msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:803
-#, fuzzy
-msgid "Copying package lists..."
-msgstr "Čitam spiskove paketa"
-
-#: apt-pkg/cdrom.cc:838
-msgid "Writing new source list\n"
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:846
-msgid "Source list entries for this disc are:\n"
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Wrote %i records.\n"
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Hash mismatch for: %s"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid "Release '%s' for '%s' was not found"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid "Version '%s' for '%s' was not found"
+msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:593
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Ne mogu otvoriti %s"
+msgid "No keyring installed in %s."
+msgstr "Odustajem od instalacije."
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
+msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:605
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Ne mogu otvoriti %s"
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ne mogu kreirati %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
+"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:51
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Error processing directory %s"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
 msgstr ""
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
+#: ftparchive/apt-ftparchive.cc:606
 msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+"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 ""
 
-#: apt-pkg/deb/dpkgpm.cc:91
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "  Instalirano:"
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
-#, fuzzy, c-format
-msgid "Configuring %s"
-msgstr "Povezujem se sa %s"
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
-#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Otvaram %s"
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je stara, pokušavam nadogradnju %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:85
 #, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Ne mogu ukloniti %s"
+msgid "Unable to open DB file %s: %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Arhiva nema kontrolnog zapisa"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/writer.cc:91
 #, c-format
-msgid "Noting disappearance of %s"
+msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: ftparchive/writer.cc:96
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr ""
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr ""
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr ""
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
 #, c-format
-msgid "Directory '%s' missing"
+msgid "Failed to resolve %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr ""
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:970
-#, fuzzy, c-format
-msgid "Preparing %s"
-msgstr "Otvaram %s"
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:971
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Otvaram %s"
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: ftparchive/writer.cc:290
 #, c-format
-msgid "Preparing to configure %s"
+msgid "Failed to unlink %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:978
-#, fuzzy, c-format
-msgid "Installed %s"
-msgstr "  Instalirano:"
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: ftparchive/writer.cc:308
 #, c-format
-msgid "Preparing for removal of %s"
+msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:985
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Preporučuje"
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
 #, c-format
-msgid "Preparing to completely remove %s"
+msgid "  %s has no override entry\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:991
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Ne mogu ukloniti %s"
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1046
-msgid "ioctl(TIOCGWINSZ) failed"
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Ne mogu zapisati na %s"
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049
-msgid "Is /dev/pts mounted?"
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
-msgid "Is stdout a terminal?"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
-msgid "Operation was interrupted before it could finish"
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
-msgid "No apport report written because MaxReports is reached already"
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
 msgstr ""
 
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
-msgid "dependency problems - leaving unconfigured"
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr ""
+
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
+msgid "Internal error, failed to create %s"
 msgstr ""
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr ""
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr ""
+
+#: ftparchive/multicompress.cc:359
 #, c-format
+msgid "Problem unlinking %s"
+msgstr ""
+
+#: cmdline/apt-internal-solver.cc:46
 msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
-msgid "Not locked"
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Nepoznat zapis paketa\""
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
 
 #~ msgid "%s not a valid DEB package."
@@ -3269,9 +3301,6 @@ msgstr ""
 #~ msgid "Failed to remove %s"
 #~ msgstr "Ne mogu ukloniti %s"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Ne mogu kreirati %s"
-
 #~ msgid "Reading file listing"
 #~ msgstr "Čitam spisak datoteke"
 
diff --git a/po/ca.po b/po/ca.po
index 6ca12fcf0..7cfd21aeb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2012-10-19 13:30+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -18,154 +18,155 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Nombre total de paquets: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Nombre total d'estructures de paquets: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Paquets normals: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Paquets virtuals purs: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Paquets virtuals únics: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Paquets virtuals mixtes: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Falten: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Nombre total de versions diferents: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Nombre total de descripcions diferents: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Nombre total de dependències: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Nombre total de relacions versió/fitxer: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Nombre total de relacions descripció/fitxer: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Nombre total dels mapes aportats: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Nombre total de cadenes globals: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Nombre total de l'espai per a dependències de versió: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Nombre total de l'espai desaprofitat: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Nombre total de l'espai atribuït a: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "El fitxer %s del paquet està desincronitzat."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "No s'han trobat paquets"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Heu de donar com a mínim un patró de cerca"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Aquesta ordre és desaconsellada. Empreu «apt-mark showauto» en el seu lloc."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "No s'ha trobat el paquet %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Fitxers de paquets:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Paquets etiquetats:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(no trobat)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Instaŀlat: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Candidat: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(cap)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Etiqueta del paquet: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Taula de versió:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -239,28 +240,28 @@ msgstr ""
 "Vegeu les pàgines de manual apt-cache(8) i apt.conf(5) per a més "
 "informació.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 5.0.3 Disc 1»"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Inseriu un disc en la unitat i premeu Intro"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "No s'ha pogut muntar «%s» a «%s»"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repetiu aquest procés per a la resta de CD del vostre joc."
 
@@ -296,47 +297,47 @@ msgstr ""
 "  -c=? Llegeix aquest fitxer de configuració\n"
 "  -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "S'està agafant «%s» com a paquet font en lloc de '%s'\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Descarta la versió «%s» no disponible del paquet «%s»"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No s'ha pogut trobar el paquet %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "S'ha marcat %s com instaŀlat manualment.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "S'ha marcat %s com instaŀlat automàticament.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -344,20 +345,20 @@ msgstr ""
 "Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» "
 "en el seu lloc."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 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:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "No és possible blocar el directori de descàrrega"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No es pot trobar un paquet de fonts per a %s"
@@ -384,81 +385,81 @@ msgstr ""
 "per obtenir les últimes actualitzacions (possiblement no publicades) del "
 "paquet.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "S'està ometent el fitxer ja baixat «%s»\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, 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:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es necessita baixar %sB d'arxius font.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obtén el font %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "No s'ha pogut baixar alguns arxius."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Baixada completa i en mode de només baixada"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "L'ordre de construir «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Ha fallat el procés fill"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -467,18 +468,18 @@ msgstr ""
 "No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) "
 "APT::Architectures per a configurar-ho"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no té dependències de construcció.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -487,7 +488,7 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer perquè %s no és permès als "
 "paquets «%s»"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,14 +497,14 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet "
 "%s"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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 instaŀlat %s és "
 "massa nou"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -512,7 +513,7 @@ msgstr ""
 "La dependència %s per a %s no es pot satisfer perquè la versió candidata del "
 "paquet %s no pot satisfer els requeriments de versions"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,30 +522,30 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió "
 "candidata"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, 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:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "No es poden processar les dependències de construcció"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Registre de canvis per a %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -636,53 +637,74 @@ msgstr ""
 "per a obtenir més informació i opcions.\n"
 "                       Aquest APT té superpoders bovins.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Haureu d'especificar un paquet de codi font per a baixar"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s no es pot marcar perquè no està instaŀlat.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s ja estava marcat com instaŀlat manualment.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s ja estava marcat com instaŀlat automàticament.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ja estava retingut.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ja estava no retingut.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperava %s però no hi era"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "S'ha marcat %s com retingut.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "S'ha cancel·lat la marca de retenció en %s.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "L'execució del dpkg ha fallat. Sou root?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -709,7 +731,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -757,52 +779,52 @@ msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús."
 msgid "Disk not found."
 msgstr "No s'ha trobat el disc"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Fitxer no trobat"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "L'estat ha fallat"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "No s'ha pogut establir el temps de modificació"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI no vàlid, els URI locals no han de començar per //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "S'està accedint a"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "No es pot determinar el nom de la màquina distant"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "No es pot determinar el nom local"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "El servidor ha rebutjat la nostra connexió i ha dit: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -810,122 +832,124 @@ msgstr ""
 "S'ha especificat un servidor intermediari però no un script d'accés, "
 "Acquire::ftp::ProxyLogin està buit."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "L'ordre «%s» de l'script d'accés ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Temps de connexió finalitzat"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "El servidor ha tancat la connexió"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Una resposta ha desbordat la memòria intermèdia."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Protocol corromput"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Error d'escriptura"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "No s'ha pogut crear un sòcol"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "No s'ha pogut connectar amb el sòcol passiu."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "gettaddrinfo no es pot obtenir un sòcol que escolte"
 
 # abastar? huh? jm
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "No s'ha pogut vincular a un connector"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "No s'ha pogut escoltar sobre el sòcol"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "No s'ha pogut determinar el nom del sòcol"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "No es pot enviar l'ordre PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "La família d'adreces %u és desconeguda (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "No es pot acceptar la connexió"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problema escollint el fitxer"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "No és possible obtenir el fitxer, el servidor ha dit '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "S'ha esgotat el temps d'espera per al sòcol de dades"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "No es pot invocar"
 
@@ -961,7 +985,7 @@ msgstr "No s'ha pogut connectar amb %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "S'està connectant amb %s"
@@ -991,40 +1015,40 @@ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "No es pot connectar amb %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "S'ha trobat almenys una signatura invàlida."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "No s'ha pogut executar el «gpgv» per a verificar la signatura (està "
 "instaŀlat el gpgv?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "S'ha produït un error desconegut en executar el gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures següents són invàlides:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1032,120 +1056,354 @@ msgstr ""
 "Les signatures següents no s'han pogut verificar perquè la clau pública no "
 "està disponible:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Els fitxers buits no poden ser arxius vàlids"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 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:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "S'ha produït un error en llegir des del servidor"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Ha fallat la selecció"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Connexió finalitzada"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "S'ha produït un error en escriure al fitxer de sortida"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "S'estan esperant les capçaleres"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Línia de capçalera incorrecta"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El servidor HTTP ha enviat una capçalera de resposta no vàlida"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 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/server.cc:199
+#: methods/server.cc:194
 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/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Aquest servidor HTTP té el suport d'abast trencat"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Format de la data desconegut"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Capçalera de dades no vàlida"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Error intern"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "S'està calculant l'actualització… "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Error intern, AllUpgrade ha trencat coses"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Fet"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "S'estan corregint les dependències…"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ha fallat."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "No es poden corregir les dependències"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "No es pot minimitzar el joc de versions revisades"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fet"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependències sense satisfer. Proveu-ho emprant -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Els següents paquets tenen dependències sense satisfer:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "però està instaŀlat %s"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "però s'instaŀlarà %s"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "però no és instaŀlable"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "però és un paquet virtual"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "però no està instaŀlat"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "però no serà instaŀlat"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "S'instaŀlaran els paquets NOUS següents:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Es SUPRIMIRAN els paquets següents:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "S'han mantingut els paquets següents:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "S'actualitzaran els paquets següents:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Es DESACTUALITZARAN els paquets següents:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Es canviaran els paquets retinguts següents:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (per %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualitzats, %lu nous a instaŀlar, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstaŀlats, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualitzats, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu a suprimir i %lu no actualitzats.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu no instaŀlats o suprimits completament.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "L'ordre update no pren arguments"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 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!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "S'ha d'obtenir %sB/%sB d'arxius.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "S'ha d'obtenir %sB d'arxius.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1153,31 +1411,31 @@ msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "No teniu prou espai lliure en %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "S'ha especificat «Trivial Only» però aquesta operació no és trivial."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Sí, fes el que et dic!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1188,19 +1446,19 @@ msgstr ""
 "Per continuar escriviu la frase «%s»\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Avortat."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Voleu continuar?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Alguns fitxers no s'han pogut baixar"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1208,19 +1466,19 @@ msgstr ""
 "No es poden baixar alguns arxius, proveu a executar apt-get update o "
 "intenteu-ho amb --fix-missing."
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing i els medi intercanviables actualment no estan suportats"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "No es poden corregir els paquets que falten."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "S'està avortant la instaŀlació."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1234,17 +1492,17 @@ msgstr[1] ""
 "Els següents paquets han desaparegut del vostre sistema ja\n"
 "que tots els fitxers s'han sobreescrit per altres paquets:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 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"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1262,15 +1520,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1281,7 +1539,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Els paquets següents s'han instaŀlat automàticament i ja no són necessaris:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1291,17 +1549,17 @@ msgstr[0] ""
 msgstr[1] ""
 "Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Empreu «apt-get autoremove» per a suprimir-lo."
 msgstr[1] "Empreu «apt-get autoremove» per a suprimir-los."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Potser voldreu executar «apt-get -f install» per corregir-ho:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1309,7 +1567,7 @@ msgstr ""
 "Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o "
 "especifiqueu una solució)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1321,322 +1579,96 @@ msgstr ""
 "«unstable» i alguns paquets requerits encara no han estat creats o bé\n"
 "encara no els hi han introduït des d'«Incoming»."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Paquets trencats"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "S'instaŀlaran els següents paquets extres:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Paquets suggerits:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Paquets recomanats:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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: Això només és una simulació!\n"
+"      L'apt-get necessita privilegis de root per a l'execució real.\n"
+"      Tingueu en ment que el bloqueig està desactivat,\n"
+"      per tant, no es depèn de la situació actual real."
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVÍS: No es poden autenticar els següents paquets!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "S'ha descartat l'avís d'autenticació.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "No s'ha pogut autenticar alguns paquets"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Voleu instaŀlar aquests paquets sense verificar-los?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "No s'ha pogut obtenir %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Els següents paquets tenen dependències sense satisfer:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "però està instaŀlat %s"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "però s'instaŀlarà %s"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "però no és instaŀlable"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "però és un paquet virtual"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "però no està instaŀlat"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "però no serà instaŀlat"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "S'instaŀlaran els paquets NOUS següents:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Es SUPRIMIRAN els paquets següents:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "S'han mantingut els paquets següents:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "S'actualitzaran els paquets següents:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Es DESACTUALITZARAN els paquets següents:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Es canviaran els paquets retinguts següents:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (per %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualitzats, %lu nous a instaŀlar, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstaŀlats, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu desactualitzats, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu a suprimir i %lu no actualitzats.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu no instaŀlats o suprimits completament.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "S'estan corregint les dependències…"
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " ha fallat."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "No es poden corregir les dependències"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "No es pot minimitzar el joc de versions revisades"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Fet"
-
-#: apt-private/private-cachefile.cc:102
-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."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependències sense satisfer. Proveu-ho emprant -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "L'ordre update no pren arguments"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "S'està calculant l'actualització… "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Error intern, AllUpgrade ha trencat coses"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Fet"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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: Això només és una simulació!\n"
-"      L'apt-get necessita privilegis de root per a l'execució real.\n"
-"      Tingueu en ment que el bloqueig està desactivat,\n"
-"      per tant, no es depèn de la situació actual real."
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "No s'ha pogut canviar el nom de %s a %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Obj "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Bai:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "S'ha baixat %sB en %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Treballant]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1649,19 +1681,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "No es pot llegir %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "No es pot canviar a %s"
@@ -1690,11 +1722,11 @@ msgstr "No es pot llegir el fitxer rèplica «%s»"
 msgid "[Mirror: %s]"
 msgstr "[Rèplica: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "No s'ha pogut crear el conducte IPC al subprocés"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "La connexió s'ha tancat prematurament"
 
@@ -1737,1342 +1769,455 @@ msgstr ""
 msgid "Merging available information"
 msgstr "S'està fusionant la informació disponible"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
-"\n"
-"apt-extracttemplates és una eina per a extreure informació de\n"
-"configuració i plantilles dels paquets debian\n"
-"\n"
-"Opcions:\n"
-"  -h   Aquest text d'ajuda.\n"
-"  -t   Estableix el directori temporal\n"
-"  -c=? Llegeix aquest fitxer de configuració\n"
-"  -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "No es pot escriure en %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "La llista de les extensions dels paquets és massa llarga"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "S'ha produït un error en processar el directori %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "La llista d'extensions de les fonts és massa llarga"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "S'ha produït un error en escriure la capçalera al fitxer de continguts"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "S'ha produït un error en processar el fitxer de continguts %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Forma d'ús: apt-ftparchive [opcions] ordre\n"
-"Ordres:   packages camí_binaris [fitxer_substitucions prefix_camí]]\n"
-"          sources camí_fonts [fitxer_substitucions [prefix_camí]]\n"
-"          contents camí\n"
-"          release camí\n"
-"          generate config [grups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive genera fitxers d'índex per als arxius de Debian.\n"
-"Gestiona molts estils per a generar-los, des dels completament automàtics\n"
-"als substituts funcionals per dpkg-scanpackages i dpkg-scansources.\n"
-"\n"
-"apt-ftparchive genera fitxers Package des d'un arbre de .deb. El\n"
-"fitxer Package conté tots els camps de control de cada paquet així com\n"
-"la suma MD5 i la mida del fitxer. Es suporten els fitxers de substitució\n"
-"per a forçar el valor de Prioritat i Secció.\n"
-"\n"
-"D'un mode semblant, apt-ftparchive genera fitxers Sources des d'un arbre\n"
-"de .dsc. Es pot utilitzar l'opció --source-override per a especificar un\n"
-"fitxer de substitucions de src.\n"
-"\n"
-"L'ordre «packages» i «sources» hauria d'executar-se en l'arrel de\n"
-"l'arbre. CamíBinaris hauria de ser el punt base de la recerca recursiva\n"
-"i el fitxer de substitucions hauria de contenir senyaladors de substitució.\n"
-"Prefixcamí s'afegeix als camps del nom de fitxer si està present.\n"
-"Exemple d'ús a l'arxiu de Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opcions:\n"
-"  -h    Aquest text d'ajuda\n"
-"  --md5 Generació del control MD5\n"
-"  -s=?  Fitxer de substitucions per a fonts\n"
-"  -q    Silenciós\n"
-"  -d=?  Selecciona la base de dades de memòria cau opcional\n"
-"  --no-delink Habilita el mode de depuració delink\n"
-"  --contents  Genera el fitxer amb els continguts de control\n"
-"  -c=?  Llegeix aquest fitxer de configuració\n"
-"  -o=?  Estableix una opció de configuració arbitrària"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "No s'ha trobat cap selecció"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "La BD és vella, s'està intentant actualitzar %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"El format de la base de dades és invàlid. Si heu actualitzat des d'una "
-"versió més antiga de l'apt, suprimiu i torneu a crear la base de dades."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "No es pot obrir el fitxer de DB %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "No es pot determinar l'estat de %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Arxiu sense registre de control"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "No es pot aconseguir un cursor"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: No es pot llegir el directori %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: No es pot veure l'estat %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "A: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Els errors s'apliquen al fitxer "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "No s'ha pogut resoldre %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "L'arbre està fallant"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "No s'ha pogut obrir %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "No s'ha pogut llegir l'enllaç %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "No s'ha pogut alliberar %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** No s'ha pogut enllaçar %s a %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink s'ha arribat al límit de %sB.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Arxiu sense el camp paquet"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s no té una entrada dominant\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  el mantenidor de %s és %s, no %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s no té una entrada dominant de font\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s no té una entrada dominant de binari\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - No s'ha pogut assignar espai en memòria"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "No es pot obrir %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Línia predominant %s malformada %llu núm 1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "No s'ha pogut llegir la línia predominant del fitxer %s"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Línia predominant %s malformada %llu núm 1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Línia predominant %s malformada %llu núm 2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Línia predominant %s malformada %llu núm 3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algorisme de compressió desconegut '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "La sortida comprimida %s necessita un joc de compressió"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "No s'ha pogut crear FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "No s'ha pogut bifurcar"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Comprimeix el fil"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "S'ha produït un error intern, no s'ha pogut crear %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Ha fallat l'E/S del subprocés sobre el fitxer"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "No s'ha pogut llegir mentre es calculava la suma MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "S'ha trobat un problema treient l'enllaç %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "No s'ha pogut canviar el nom de %s a %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
-"\n"
-"apt-extracttemplates és una eina per a extreure informació de\n"
-"configuració i plantilles dels paquets debian\n"
-"\n"
-"Opcions:\n"
-"  -h   Aquest text d'ajuda.\n"
-"  -t   Estableix el directori temporal\n"
-"  -c=? Llegeix aquest fitxer de configuració\n"
-"  -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Registre del paquet desconegut!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 …]\n"
-"\n"
-"apt-sortpkgs és una eina simple per ordenar fitxers de paquets.\n"
-"L'opció -s s'usa per a indicar quin tipus de fitxer és.\n"
-"\n"
-"Opcions:\n"
-"  -h   Aquest text d'ajuda.\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"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "No es poden crear els conductes"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "No es pot executar el gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Arxiu corromput"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "La suma de comprovació de tar ha fallat, arxiu corromput"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Signatura de l'arxiu no vàlida"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "S'ha produït un error en llegir la capçalera del membre de l'arxiu"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "La capçalera %s del membre de l'arxiu no és vàlida"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "La capçalera del membre de l'arxiu no és vàlida"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "L'arxiu és massa petit"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Ha fallat la lectura de les capçaleres de l'arxiu"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode crida a un node que encara està enllaçat"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "No s'ha trobat l'element diseminat!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "No s'ha pogut assignar la desviació"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "S'ha produït un error intern en AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "S'està intentant sobreescriure una desviació, %s -> %s i %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Afegit doble d'una desviació %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Fitxer de conf. duplicat %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "No s'ha pogut escriure el fitxer %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Ha fallat el tancament del fitxer %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "La ruta %s és massa llarga"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "S'està desempaquetant %s més d'una vegada"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "El directori %s està desviat"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "El paquet està intentant escriure en l'objectiu desviat %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "La ruta de desviació és massa llarga"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "No es pot determinar l'estat de %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "No s'ha pogut canviar el nom de %s a %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "El directori %s està sent reemplaçat per un no-directori"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "No s'ha trobat el node dins de la taula"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "La ruta és massa llarga"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "No es pot veure l'estat de %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "No s'ha pogut escriure el fitxer %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Ha fallat el tancament del fitxer %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Error intern, no s'ha pogut localitzar al membre %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "El fitxer de control no es pot analitzar"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "No es pot transferir un fitxer buit a memòria"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "No s'ha pogut duplicar el descriptor del fitxer %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "No s'ha pogut crear un mapa de memòria de %llu octets"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "No es pot tancar el mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "No es pot sincronitzar el mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-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:322
-msgid "Failed to truncate file"
-msgstr "No s'ha pogut truncar el fitxer %s"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-"
-"Start. Valor actual: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"No s'ha pogut incrementar la mida del MMap ja que el limit de %lu bytes ja "
-"s'ha superat."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"No s'ha pogut incrementar la mida del MMap ja que el creixement automàtic "
-"està deshabilitat per l'usuari."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Signatura de l'arxiu no vàlida"
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "S'ha produït un error en llegir la capçalera del membre de l'arxiu"
 
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Selection %s not found"
-msgstr "No s'ha trobat la selecció %s"
+msgid "Invalid archive member header %s"
+msgstr "La capçalera %s del membre de l'arxiu no és vàlida"
 
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Abreujament de tipus no reconegut: «%c»"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "La capçalera del membre de l'arxiu no és vàlida"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "S'està obrint el fitxer de configuració %s"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "L'arxiu és massa petit"
 
-#: apt-pkg/contrib/configuration.cc:785
-#, 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-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Ha fallat la lectura de les capçaleres de l'arxiu"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Error sintàctic %s:%u: Etiqueta malformada"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "No es poden crear els conductes"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Error sintàctic %s:%u Text extra després del valor"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "No es pot executar el gzip "
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Arxiu corromput"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "La suma de comprovació de tar ha fallat, arxiu corromput"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Error sintàctic %s:%u: Inclusió des d'aquí"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Error sintàctic %s:%u: Directriu no suportada «%s»"
+msgid "Unable to stat %s."
+msgstr "No es pot veure l'estat de %s."
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Error sintàctic %s:%u: la directiva clear requereix un arbre d'opcions com a "
-"argument"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, 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"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s… Error!"
-
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s… Fet"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr "…"
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s… %u%%"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "L'opció de la línia d'ordres «%c» [de %s] és desconeguda."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "No s'entén l'opció de la línia d'ordres %s"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "No és lògica l'opció de la línia d'ordres %s"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "L'opció de la línia d'ordres %s precisa un paràmetre."
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opció %s: Paràmetre de configuració ha de ser en la forma =<val>"
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "L'opció %s precisa un paràmetre numèric, no '%s'"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "S'està executant dpkg"
 
-#: apt-pkg/contrib/cmndline.cc:304
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "L'opció '%s' és massa llarga"
+msgid "Packaging system '%s' is not supported"
+msgstr "El sistema d'empaquetament «%s» no està suportat"
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "El sentit %s no s'entén, proveu «true» (vertader) o «false» (fals)."
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
 
-#: apt-pkg/contrib/cmndline.cc:386
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Invalid operation %s"
-msgstr "Operació no vàlida %s"
+msgid "Wrote %i records.\n"
+msgstr "S'han escrit %i registres.\n"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "No es pot obtenir informació del punt de muntatge %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "No s'ha pogut fer «stat» del cdrom"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Ha hagut un problema en tancar el fitxer gzip %s"
+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/contrib/fileutl.cc:228
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Not using locking for read only lock file %s"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s"
+"S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no "
+"coincidents\n"
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open lock file %s"
-msgstr "No es pot resoldre el fitxer de blocat %s"
+msgid "Can't find authentication record for: %s"
+msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs"
+msgid "Hash mismatch for: %s"
+msgstr "El resum no coincideix per a: %s"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not get lock %s"
-msgstr "No s'ha pogut blocar %s"
+msgid "The method driver %s could not be found."
+msgstr "No s'ha pogut trobar el mètode de control %s."
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "No es pot crear la llista de fitxers perquè «%s» no és un directori"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "S'està descartant «%s» al directori «%s» perquè no és un fitxer normal"
+msgid "Method %s did not start correctly"
+msgstr "El mètode %s no s'ha iniciat correctament"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-"S'està descartant «%s» al directori «%s» perquè no té extensió del nom de "
-"fitxer"
+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/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"S'està descartant «%s» al directori «%s» perquè té una extensió del nom de "
-"fitxer invàlida"
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "El sub-procés %s ha rebut una violació de segment."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "El sub-procés %s ha rebut un senyal %u."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "El sub-procés %s ha retornat un codi d'error (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "El sub-procés %s ha sortit inesperadament"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "No s'ha pogut obrir el fitxer %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "No s'ha pogut obrir el descriptor del fitxer %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "No s'ha pogut crear el subprocés IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "No s'ha pogut executar el compressor "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "llegits, falten %llu per llegir, però no queda res"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "escrits, falten %llu per escriure però no s'ha pogut"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "Ha hagut un problema en tancar el fitxer %s"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Ha hagut un problema en desenllaçar el fitxer %s"
+"No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Ha hagut un problema en sincronitzar el fitxer"
+#: apt-pkg/cachefile.cc:98
+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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No s'ha instaŀlat cap clauer a %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "No s'ha pogut llegir la llista de les fonts."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Memòria cau de paquets és buida"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "El fitxer de memòria cau de paquets està corromput"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 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:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "El fitxer de memòria cau de paquets està corromput, és massa petit"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 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:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Depèn"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Predepèn"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Suggereix"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Recomana"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Entra en conflicte"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Reemplaça"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Fa obsolet"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Trenca"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Millora"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "requerit"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "estàndard"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "S'està construint l'arbre de dependències"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Versions candidates"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Dependències que genera"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "S'està llegint la informació de l'estat"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No s'ha pogut obrir el fitxer d'estat %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "No es pot analitzar el fitxer del paquet %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "No es pot analitzar el fitxer del paquet %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Línia %lu malformada en la llista de fonts %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Línia %lu malformada en la llista de fonts %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "S'està obrint %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "La línia %u és massa llarga en la llista de fonts %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 apt."
-"conf, sota APT::Immediate-Configure per a més detalls. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "No s'ha pogut configurar «%s»."
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Aquesta instaŀlació requereix suprimir temporalment el paquet essencial %s "
-"per qüestió d'un bucle de Conflictes/Pre-dependències. Això sol ser una cosa "
-"dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-"
-"LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "El tipus de fitxer índex «%s» no està suportat"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
-"causat per paquets retinguts."
-
-#: apt-pkg/algorithms.cc:1070
-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/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Falta el directori de llistes %spartial."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Falta el directori d'arxius %spartial."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "No es pot blocar el directori %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, 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:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "S'està obtenint el fitxer %li de %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "No s'ha pogut trobar el mètode de control %s."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El mètode %s no s'ha iniciat correctament"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "El sistema d'empaquetament «%s» no està suportat"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "No es pot veure l'estat de %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "No s'ha pogut llegir la llista de les fonts."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"El valor «%s» és invàlid per a APT:Default-Release donat que aquest "
-"llançament no és disponible a les fonts"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Registre no vàlid al fitxer de preferències %s, paquet sense capçalera"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "No s'ha entès el pin de tipus %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "No hi ha prioritat especificada per al pin (o és zero)"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "La memòria cau té un sistema de versions incompatible"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "S'ha produït un error en processar %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de paquets que aquest APT és capaç de gestionar."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de versions que aquest APT és capaç de gestionar."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de descripcions que aquest APT és capaç de "
 "gestionar. "
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de dependències que aquest APT és capaç de "
 "gestionar."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "No s'ha trobat el paquet %s %s en processar les dependències del fitxer"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "No s'ha pogut llegir la llista de paquets font %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "S'està llegint la llista de paquets"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "S'estan recollint els fitxers que proveeixen"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "No es pot escriure en %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Error d'E/S en desar la memòria cau de la font"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Envia l'escenari al resoledor"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Envia la petició al resoledor"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Prepara per a rebre una solució"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Executa un resoledor extern"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "La suma resum no concorda"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "La mida no concorda"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operació no vàlida %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3081,16 +2226,16 @@ msgstr ""
 "No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia "
 "al sources.list o fitxer malformat)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3099,12 +2244,12 @@ msgstr ""
 "El fitxer Release per a %s ha caducat (invàlid des de %s). Les "
 "actualitzacions per a aquest dipòsit no s'aplicaran."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3115,12 +2260,12 @@ msgstr ""
 "%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "S'ha produït un error amb el GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3130,12 +2275,12 @@ msgstr ""
 "significar que haureu d'arreglar aquest paquet manualment (segons "
 "arquitectura)."
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "No es troba una font per baixar la versió «%s» de «%s»"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3143,71 +2288,135 @@ msgstr ""
 "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
 "per al paquet %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "No es pot analitzar el fitxer Release %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "El camp del proveïdor %s no té una empremta digital"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "No hi ha seccions al fitxer Release %s"
+msgid "List directory %spartial is missing."
+msgstr "Falta el directori de llistes %spartial."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "No hi ha una entrada Hash al fitxer Release %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Falta el directori d'arxius %spartial."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid"
+msgid "Unable to lock directory %s"
+msgstr "No es pot blocar el directori %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "El camp «Date» al fitxer Release %s és invàlid"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "S'està obtenint el fitxer %li de %li (falten %s)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "El camp del proveïdor %s no té una empremta digital"
+msgid "Retrieving file %li of %li"
+msgstr "S'està obtenint el fitxer %li de %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Alguns índex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han "
+"emprat els antics."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"El valor «%s» és invàlid per a APT:Default-Release donat que aquest "
+"llançament no és disponible a les fonts"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Registre no vàlid al fitxer de preferències %s, paquet sense capçalera"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "No s'ha entès el pin de tipus %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "No hi ha prioritat especificada per al pin (o és zero)"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 apt."
+"conf, sota APT::Immediate-Configure per a més detalls. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "No s'ha pogut configurar «%s»."
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Aquesta instaŀlació requereix suprimir temporalment el paquet essencial %s "
+"per qüestió d'un bucle de Conflictes/Pre-dependències. Això sol ser una cosa "
+"dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-"
+"LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "La línia %u és massa llarga en la llista de fonts %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "S'està desmuntant el CD-ROM…\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "S'està desmuntant el CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "S'està esperant al disc…\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "S'està muntant el CD-ROM…\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "S'està identificant…"
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "S'ha emmagatzemat l'etiqueta: %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "S'esta desmuntant el CD-ROM…\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "S'està analitzant el disc per a fitxers d'índex…\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3216,7 +2425,7 @@ msgstr ""
 "S'han trobat %zu índexos de paquets, %zu índexos de fonts, %zu indexos de "
 "traduccions i %zu signatures\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3224,16 +2433,16 @@ msgstr ""
 "No s'ha trobat cap fitxer de paquets, potser no és un disc de Debian o la "
 "arquitectura és incorrecta?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "S'ha trobat l'etiqueta «%s»\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3242,83 +2451,108 @@ msgstr ""
 "El disc es diu:\n"
 "«%s»\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "S'estan copiant les llistes de paquets…"
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "S'està escrivint una nova llista de fonts\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 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:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "S'han escrit %i registres.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
+"causat per paquets retinguts."
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/algorithms.cc:1088
+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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "S'està construint l'arbre de dependències"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versions candidates"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependències que genera"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "S'està llegint la informació de l'estat"
+
+#: apt-pkg/depcache.cc:250
 #, 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"
+msgid "Failed to open StateFile %s"
+msgstr "No s'ha pogut obrir el fitxer d'estat %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no "
-"coincidents\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "No es pot analitzar el fitxer del paquet %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "El resum no coincideix per a: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "No es pot analitzar el fitxer del paquet %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "No s'ha trobat la versió «%s» per a «%s»"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "No s'ha pogut trobar la tasca «%s»"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "No s'han pogut seleccionar les versions del paquet «%s» ja que és purament "
 "virtual"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3327,176 +2561,242 @@ msgstr ""
 "No s'han pogut seleccionar la versió instaŀlada ni la candidata del paquet "
 "«%s» ja que no estan disponibles cap de les dues"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és "
 "purament virtual"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "No s'ha pogut seleccionar la versió candidata del paquet %s ja que no té "
 "candidata"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està "
 "instaŀlada"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Envia l'escenari al resoledor"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "No es pot analitzar el fitxer Release %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Envia la petició al resoledor"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "No hi ha seccions al fitxer Release %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Prepara per a rebre una solució"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "No hi ha una entrada Hash al fitxer Release %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Executa un resoledor extern"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "El camp «Date» al fitxer Release %s és invàlid"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "S'està executant dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
-"Alguns índex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han "
-"emprat els antics."
+"Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Línia %lu malformada en la llista de fonts %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Línia %lu malformada en la llista de fonts %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "S'està obrint %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "S'està instaŀlant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "S'està configurant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "S'està suprimint el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "S'ha suprimit completament %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "S'està anotant la desaparició de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "S'està executant l'activador de postinstaŀlació %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Manca el directori «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "No s'ha pogut obrir el fitxer «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "S'està preparant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "S'està desempaquetant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "S'està preparant per a configurar el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "S'ha instaŀlat el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "S'està preparant per a la supressió del paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "S'ha suprimit el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "S'està preparant per a suprimir completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "S'ha suprimit completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "No es pot escriure en %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "S'ha interromput l'operació abans que pogués finalitzar"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "S'han produït problemes de depències, es deixa sense configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3504,7 +2804,7 @@ msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica que és un error "
 "consequent de una fallida anterior."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3512,7 +2812,7 @@ msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
 "disc ple"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3520,7 +2820,7 @@ msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
 "falta de memòria"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3529,14 +2829,14 @@ msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
 "disc ple"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica d'una fallida "
 "d'E/S del dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3545,14 +2845,14 @@ msgstr ""
 "No s'ha pogut bloquejar el directori d'administració (%s), hi ha cap altre "
 "procés utilitzant-lo?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "No es pot blocar el directori d'administració (%s), sou root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3560,10 +2860,743 @@ msgstr ""
 "S'ha interromput el dpkg, hauríeu d'executar manualment «%s» per a corregir "
 "el problema."
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "No blocat"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "No s'ha trobat la selecció %s"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+"No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "No es pot resoldre el fitxer de blocat %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "No s'ha pogut blocar %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "No es pot crear la llista de fitxers perquè «%s» no és un directori"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "S'està descartant «%s» al directori «%s» perquè no és un fitxer normal"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+"S'està descartant «%s» al directori «%s» perquè no té extensió del nom de "
+"fitxer"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"S'està descartant «%s» al directori «%s» perquè té una extensió del nom de "
+"fitxer invàlida"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "El sub-procés %s ha rebut una violació de segment."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "El sub-procés %s ha rebut un senyal %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "El sub-procés %s ha retornat un codi d'error (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "El sub-procés %s ha sortit inesperadament"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Ha hagut un problema en tancar el fitxer gzip %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "No s'ha pogut obrir el fitxer %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "No s'ha pogut obrir el descriptor del fitxer %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "No s'ha pogut crear el subprocés IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "No s'ha pogut executar el compressor "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "llegits, falten %llu per llegir, però no queda res"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "escrits, falten %llu per escriure però no s'ha pogut"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Ha hagut un problema en tancar el fitxer %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Ha hagut un problema en desenllaçar el fitxer %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Ha hagut un problema en sincronitzar el fitxer"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s… Error!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s… Fet"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr "…"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "No es pot transferir un fitxer buit a memòria"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "No s'ha pogut duplicar el descriptor del fitxer %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "No s'ha pogut crear un mapa de memòria de %llu octets"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "No es pot tancar el mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "No es pot sincronitzar el mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+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:322
+msgid "Failed to truncate file"
+msgstr "No s'ha pogut truncar el fitxer %s"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-"
+"Start. Valor actual: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"No s'ha pogut incrementar la mida del MMap ja que el limit de %lu bytes ja "
+"s'ha superat."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"No s'ha pogut incrementar la mida del MMap ja que el creixement automàtic "
+"està deshabilitat per l'usuari."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "No es pot obtenir informació del punt de muntatge %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "No s'ha pogut fer «stat» del cdrom"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Abreujament de tipus no reconegut: «%c»"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "S'està obrint el fitxer de configuració %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Error sintàctic %s:%u: Etiqueta malformada"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Error sintàctic %s:%u: Inclusió des d'aquí"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, 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:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Error sintàctic %s:%u: la directiva clear requereix un arbre d'opcions com a "
+"argument"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, 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"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "No s'ha instaŀlat cap clauer a %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "L'opció de la línia d'ordres «%c» [de %s] és desconeguda."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "No s'entén l'opció de la línia d'ordres %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "No és lògica l'opció de la línia d'ordres %s"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "L'opció de la línia d'ordres %s precisa un paràmetre."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opció %s: Paràmetre de configuració ha de ser en la forma =<val>"
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "L'opció %s precisa un paràmetre numèric, no '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "L'opció '%s' és massa llarga"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "El sentit %s no s'entén, proveu «true» (vertader) o «false» (fals)."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Operació no vàlida %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
+"\n"
+"apt-extracttemplates és una eina per a extreure informació de\n"
+"configuració i plantilles dels paquets debian\n"
+"\n"
+"Opcions:\n"
+"  -h   Aquest text d'ajuda.\n"
+"  -t   Estableix el directori temporal\n"
+"  -c=? Llegeix aquest fitxer de configuració\n"
+"  -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "No es pot veure l'estat de %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "La llista de les extensions dels paquets és massa llarga"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "S'ha produït un error en processar el directori %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "La llista d'extensions de les fonts és massa llarga"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "S'ha produït un error en escriure la capçalera al fitxer de continguts"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "S'ha produït un error en processar el fitxer de continguts %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Forma d'ús: apt-ftparchive [opcions] ordre\n"
+"Ordres:   packages camí_binaris [fitxer_substitucions prefix_camí]]\n"
+"          sources camí_fonts [fitxer_substitucions [prefix_camí]]\n"
+"          contents camí\n"
+"          release camí\n"
+"          generate config [grups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive genera fitxers d'índex per als arxius de Debian.\n"
+"Gestiona molts estils per a generar-los, des dels completament automàtics\n"
+"als substituts funcionals per dpkg-scanpackages i dpkg-scansources.\n"
+"\n"
+"apt-ftparchive genera fitxers Package des d'un arbre de .deb. El\n"
+"fitxer Package conté tots els camps de control de cada paquet així com\n"
+"la suma MD5 i la mida del fitxer. Es suporten els fitxers de substitució\n"
+"per a forçar el valor de Prioritat i Secció.\n"
+"\n"
+"D'un mode semblant, apt-ftparchive genera fitxers Sources des d'un arbre\n"
+"de .dsc. Es pot utilitzar l'opció --source-override per a especificar un\n"
+"fitxer de substitucions de src.\n"
+"\n"
+"L'ordre «packages» i «sources» hauria d'executar-se en l'arrel de\n"
+"l'arbre. CamíBinaris hauria de ser el punt base de la recerca recursiva\n"
+"i el fitxer de substitucions hauria de contenir senyaladors de substitució.\n"
+"Prefixcamí s'afegeix als camps del nom de fitxer si està present.\n"
+"Exemple d'ús a l'arxiu de Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opcions:\n"
+"  -h    Aquest text d'ajuda\n"
+"  --md5 Generació del control MD5\n"
+"  -s=?  Fitxer de substitucions per a fonts\n"
+"  -q    Silenciós\n"
+"  -d=?  Selecciona la base de dades de memòria cau opcional\n"
+"  --no-delink Habilita el mode de depuració delink\n"
+"  --contents  Genera el fitxer amb els continguts de control\n"
+"  -c=?  Llegeix aquest fitxer de configuració\n"
+"  -o=?  Estableix una opció de configuració arbitrària"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "No s'ha trobat cap selecció"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "La BD és vella, s'està intentant actualitzar %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"El format de la base de dades és invàlid. Si heu actualitzat des d'una "
+"versió més antiga de l'apt, suprimiu i torneu a crear la base de dades."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "No es pot obrir el fitxer de DB %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Arxiu sense registre de control"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "No es pot aconseguir un cursor"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "A: No es pot llegir el directori %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "A: No es pot veure l'estat %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "A: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Els errors s'apliquen al fitxer "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "No s'ha pogut resoldre %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "L'arbre està fallant"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "No s'ha pogut obrir %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "No s'ha pogut llegir l'enllaç %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "No s'ha pogut alliberar %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** No s'ha pogut enllaçar %s a %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink s'ha arribat al límit de %sB.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Arxiu sense el camp paquet"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s no té una entrada dominant\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  el mantenidor de %s és %s, no %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s no té una entrada dominant de font\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s no té una entrada dominant de binari\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - No s'ha pogut assignar espai en memòria"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "No es pot obrir %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Línia predominant %s malformada %llu núm 1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "No s'ha pogut llegir la línia predominant del fitxer %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Línia predominant %s malformada %llu núm 1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Línia predominant %s malformada %llu núm 2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Línia predominant %s malformada %llu núm 3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algorisme de compressió desconegut '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "La sortida comprimida %s necessita un joc de compressió"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "No s'ha pogut crear FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "No s'ha pogut bifurcar"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Comprimeix el fil"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "S'ha produït un error intern, no s'ha pogut crear %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Ha fallat l'E/S del subprocés sobre el fitxer"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "No s'ha pogut llegir mentre es calculava la suma MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "S'ha trobat un problema treient l'enllaç %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
+"\n"
+"apt-extracttemplates és una eina per a extreure informació de\n"
+"configuració i plantilles dels paquets debian\n"
+"\n"
+"Opcions:\n"
+"  -h   Aquest text d'ajuda.\n"
+"  -t   Estableix el directori temporal\n"
+"  -c=? Llegeix aquest fitxer de configuració\n"
+"  -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Registre del paquet desconegut!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 …]\n"
+"\n"
+"apt-sortpkgs és una eina simple per ordenar fitxers de paquets.\n"
+"L'opció -s s'usa per a indicar quin tipus de fitxer és.\n"
+"\n"
+"Opcions:\n"
+"  -h   Aquest text d'ajuda.\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"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s no és un paquet DEB vàlid."
 
diff --git a/po/cs.po b/po/cs.po
index d3442e87f..f35bf9477 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2012-07-08 13:46+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -17,152 +17,153 @@ 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:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Celkem názvů balíků: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Celkem struktur balíků: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Normálních balíků: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Čistě virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Jednoduchých virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Smíšených virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Chybějících: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Celkem různých verzí: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Celkem různých popisů: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Celkem závislostí: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Celkem vztahů ver/soubor: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Celkem vztahů popis/soubor: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Celkem poskytnutých mapování: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Celkem globovaných řetězců: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Celkem místa závislých verzí: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Celkem jalového místa: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Celkem přiřazeného místa: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Soubor balíku %s je špatně synchronizovaný."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Nebyly nalezeny žádné balíky"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Musíte zadat alespoň jeden vyhledávací vzor"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Tento příkaz je zastaralý, použijte místo něj „apt-mark showauto“."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nelze najít balík %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Soubory balíku:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Vypíchnuté balíky:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(nenalezeno)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Instalovaná verze: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(žádná)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Vypíchnutý balík: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Tabulka verzí:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -231,28 +232,28 @@ msgstr ""
 "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
 "Více informací viz manuálové stránky apt-cache(8) a apt.conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Zadejte prosím název tohoto média, např. „Debian 5.0.3 Disk 1“"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Vložte prosím médium do mechaniky a stiskněte enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Selhalo připojení „%s“ na „%s“"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Tento proces opakujte pro všechna zbývající média."
 
@@ -288,47 +289,47 @@ msgstr ""
 "  -c=? Načte tento konfigurační soubor\n"
 "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Vybírám „%s“ jako zdrojový balík místo „%s“\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Ignoruje se nedostupná verze „%s“ balíku „%s“"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nelze najít balík %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nastaven jako instalovaný ručně.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s nastaven jako instalovaný automaticky.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -336,19 +337,19 @@ msgstr ""
 "Tento příkaz je zastaralý, použijte místo něj „apt-mark auto“ a „apt-mark "
 "manual“."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Nelze zamknout adresář pro stahování"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nelze najít zdrojový balík pro %s"
@@ -373,80 +374,80 @@ msgstr ""
 "použijte:\n"
 "bzr branch %s\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Přeskakuji dříve stažený soubor „%s“\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nelze určit volné místo v %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Na %s nemáte dostatek volného místa"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, 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:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stažení zdroje %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Stažení některých archivů selhalo."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Stahování dokončeno v režimu pouze stáhnout"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Příkaz pro sestavení „%s“ selhal.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Synovský proces selhal"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -455,17 +456,17 @@ msgstr ""
 "O architektuře %s nejsou známy žádné informace. Pro nastavení si přečtěte "
 "část APT::Architectures v manuálové stránce apt.conf(5)"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nelze získat závislosti pro sestavení %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žádné závislosti pro sestavení.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -474,20 +475,20 @@ msgstr ""
 "závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ "
 "dovolena"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -496,7 +497,7 @@ msgstr ""
 "závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s "
 "nesplňuje požadavek na verzi"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -505,30 +506,30 @@ msgstr ""
 "závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou "
 "verzi"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Selhalo splnění závislosti %s pro %s: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, 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:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Chyba při zpracování závislostí pro sestavení"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Seznam změn %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -615,53 +616,74 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tato APT má schopnosti svaté krávy.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s nemůže být označen, protože není nainstalovaný.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s již byl nastaven jako instalovaný ručně.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s již byl nastaven jako instalovaný automaticky.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s již byl podržen v aktuální verzi.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s již nebyl držen v aktuální verzi.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Čekal jsem na %s, ale nebyl tam"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s bude podržen v aktuální verzi.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Podržení balíku %s v aktuální verzi bylo zrušeno.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Spuštění dpkg selhalo. Jste root?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -707,7 +729,7 @@ msgstr ""
 "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
 "Více informací viz manuálové stránky apt-mark(8) a apt.conf(5)."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -755,52 +777,52 @@ msgstr "Nelze odpojit CD-ROM v %s - možná se stále používá."
 msgid "Disk not found."
 msgstr "Disk nebyl nalezen."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Soubor nebyl nalezen"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Selhalo vyhodnocení"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Nelze nastavit čas modifikace"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Neplatné URI, lokální URI nesmí začínat na //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Nelze určit jméno druhé strany"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Nelze určit lokální jméno"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Server zamítl naše spojení a řekl: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER selhal, server řekl: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS selhal, server řekl: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -808,121 +830,123 @@ msgstr ""
 "Byl zadán proxy server, ale ne přihlašovací skript. Acquire::ftp::ProxyLogin "
 "je prázdný."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Příkaz „%s“ přihlašovacího skriptu selhal, server řekl: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE selhal, server řekl: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Čas spojení vypršel"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Server uzavřel spojení"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Chyba čtení"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Odpověď přeplnila buffer."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Porušení protokolu"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Chyba zápisu"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Nelze vytvořit socket"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nelze připojit datový socket, čas spojení vypršel"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Selhalo"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Nelze připojit pasivní socket."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nezískal naslouchající socket"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Nelze navázat socket"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Nelze naslouchat na socketu"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Nelze určit jméno socketu"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Nelze odeslat příkaz PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Neznámá rodina adres %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT selhal, server řekl: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Spojení datového socketu vypršelo"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Nelze přijmout spojení"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problém s kontrolním součtem souboru"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nelze stáhnout soubor, server řekl „%s“"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Datový socket vypršel"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Přenos dat selhal, server řekl „%s“"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Dotaz"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Nelze vyvolat "
 
@@ -958,7 +982,7 @@ msgstr "Nelze se připojit k %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Připojuji se k %s"
@@ -988,36 +1012,36 @@ msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i -
 msgid "Unable to connect to %s:%s:"
 msgstr "Nelze se připojit k %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Nelze spustit „gpgv“ pro ověření podpisu (je gpgv nainstalováno?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Neznámá chyba při spouštění gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Následující podpisy jsou neplatné:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1025,147 +1049,383 @@ msgstr ""
 "Následující podpisy nemohly být ověřeny, protože není dostupný veřejný "
 "klíč:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Prázdné soubory nejsou platnými archivy"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Chyba čtení ze serveru"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Výběr selhal"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Čas spojení vypršel"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupního souboru"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Čekám na hlavičky"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Chybná hlavička"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http server poslal neplatnou hlavičku odpovědi"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http server poslal neplatnou hlavičku Content-Length"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http server poslal neplatnou hlavičku Content-Range"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má porouchanou podporu rozsahů"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Neznámý formát data"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Špatné datové záhlaví"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Propočítávám aktualizaci… "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Hotovo"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Opravuji závislosti…"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " selhalo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nelze opravit závislosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nelze minimalizovat sadu pro aktualizaci"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Hotovo"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Pro opravení můžete spustit „apt-get -f install“."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nesplněné závislosti. Zkuste použít -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[Instalovaný]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr "[Instalovaný]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[Instalovaný]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr "[Instalovaný]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Následující balíky mají nesplněné závislosti:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "ale %s je nainstalován"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale %s se bude instalovat"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "ale nedá se nainstalovat"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "ale je to virtuální balík"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "ale není nainstalovaný"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "ale nebude se instalovat"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " nebo"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Následující NOVÉ balíky budou nainstalovány:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Následující balíky budou ODSTRANĚNY:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Následující balíky jsou podrženy v aktuální verzi:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Následující balíky budou aktualizovány:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Následující balíky budou DEGRADOVÁNY:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Následující podržené balíky budou změněny:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (kvůli %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizováno, %lu nově instalováno, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu přeinstalováno, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu degradováno, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu k odstranění a %lu neaktualizováno.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Chyba při kompilaci regulárního výrazu - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Příkaz update neakceptuje žádné argumenty"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Potřebuji stáhnout %sB/%sB archivů.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Potřebuji stáhnout %sB archivů.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "V %s nemáte dostatek volného místa."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Ano, udělej to tak, jak říkám!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1176,19 +1436,19 @@ msgstr ""
 "Pro pokračování opište frázi „%s“\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Přerušeno."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovat?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Některé soubory nemohly být staženy"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1196,19 +1456,19 @@ msgstr ""
 "Nelze stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
 "fix-missing?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing a výměna média nejsou momentálně podporovány"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Nelze opravit chybějící balíky."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Přerušuji instalaci."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1225,15 +1485,15 @@ msgstr[2] ""
 "Následující balíky z tohoto systému zmizely, protože\n"
 "všechny jejich soubory byly přepsány jinými balíky:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1251,15 +1511,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnitřní chyba, AutoRemover pokazil věci"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1271,7 +1531,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1280,18 +1540,18 @@ msgstr[0] "%lu balík byl nainstalován automaticky a již není potřeba.\n"
 msgstr[1] "%lu balíky byly nainstalovány automaticky a již nejsou potřeba.\n"
 msgstr[2] "%lu balíků bylo nainstalováno automaticky a již nejsou potřeba.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Pro jeho odstranění použijte „apt-get autoremove“."
 msgstr[1] "Pro jejich odstranění použijte „apt-get autoremove“."
 msgstr[2] "Pro jejich odstranění použijte „apt-get autoremove“."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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“:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1299,7 +1559,7 @@ msgstr ""
 "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
 "navrhněte řešení)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1310,323 +1570,96 @@ 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."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Poškozené balíky"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Následující extra balíky budou instalovány:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Doporučované balíky:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"INFO: Toto je pouze simulace!\n"
+"      apt-get vyžaduje pro skutečný běh rootovská oprávnění.\n"
+"      Mějte také na paměti, že je vypnuto zamykání, tudíž\n"
+"      tyto výsledky nemusí mít s realitou nic společného!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Autentizační varování potlačeno.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Některé balíky nemohly být autentizovány"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Instalovat tyto balíky bez ověření?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Selhalo stažení %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[Instalovaný]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[Instalovaný]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "[Instalovaný]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr "[Instalovaný]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Následující balíky mají nesplněné závislosti:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "ale %s je nainstalován"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ale %s se bude instalovat"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "ale nedá se nainstalovat"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "ale je to virtuální balík"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "ale není nainstalovaný"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "ale nebude se instalovat"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " nebo"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Následující NOVÉ balíky budou nainstalovány:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Následující balíky budou ODSTRANĚNY:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Následující balíky jsou podrženy v aktuální verzi:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Následující balíky budou aktualizovány:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Následující balíky budou DEGRADOVÁNY:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Následující podržené balíky budou změněny:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (kvůli %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualizováno, %lu nově instalováno, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu přeinstalováno, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu degradováno, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu k odstranění a %lu neaktualizováno.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Chyba při kompilaci regulárního výrazu - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Opravuji závislosti…"
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " selhalo."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Nelze opravit závislosti"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Nelze minimalizovat sadu pro aktualizaci"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Pro opravení můžete spustit „apt-get -f install“."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nesplněné závislosti. Zkuste použít -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Příkaz update neakceptuje žádné argumenty"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Propočítávám aktualizaci… "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Hotovo"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"INFO: Toto je pouze simulace!\n"
-"      apt-get vyžaduje pro skutečný běh rootovská oprávnění.\n"
-"      Mějte také na paměti, že je vypnuto zamykání, tudíž\n"
-"      tyto výsledky nemusí mít s realitou nic společného!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Selhalo přejmenování %s na %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Cíl "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Mám:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Staženo %sB za %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Pracuji]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1639,19 +1672,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nelze číst %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nelze přejít do %s"
@@ -1680,11 +1713,11 @@ msgstr "Nelze číst soubor se zrcadly „%s“"
 msgid "[Mirror: %s]"
 msgstr "[Zrcadlo: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Selhalo vytvoření meziprocesové roury k podprocesu"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Spojení bylo předčasně ukončeno"
 
@@ -1722,1318 +1755,445 @@ msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalova
 msgid "Merging available information"
 msgstr "Slučuji dostupné informace"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Použití: apt-extracttemplates soubor1 [soubor2 …]\n"
-"\n"
-"apt-extracttemplates umí z balíků vytáhnout konfigurační skripty a šablony\n"
-"\n"
-"Volby:\n"
-"  -h   Tato nápověda.\n"
-"  -t   Nastaví dočasný adresář\n"
-"  -c=? Načte tento konfigurační soubor\n"
-"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nelze zapsat do %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Seznam rozšíření balíku je příliš dlouhý"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Chyba zpracování adresáře %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Seznam zdrojových rozšíření je příliš dlouhý"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Chyba při zapisování hlavičky do souboru"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Chyba při zpracovávání obsahu %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Použití: apt-ftparchive [volby] příkaz\n"
-"Příkazy: packages binárnícesta [souboroverride [prefixcesty]]\n"
-"         sources zdrojovácesta [souboroverride [prefixcesty]]\n"
-"         contents cesta\n"
-"         release cesta\n"
-"         generate konfiguračnísoubor [skupiny]\n"
-"         clean konfiguračnísoubor\n"
-"\n"
-"apt-ftparchive generuje indexové soubory debianích archivů. Podporuje\n"
-"několik režimů vytváření - od plně automatického až po funkční ekvivalent\n"
-"příkazů dpkg-scanpackages a dpkg-scansources.\n"
-"\n"
-"apt-ftparchive vytvoří ze stromu .deb souborů soubory Packages. Soubor\n"
-"Packages obsahuje kromě všech kontrolních polí každého balíku také jeho\n"
-"velikost a MD5 součet. Podporován je také soubor override, kterým můžete \n"
-"vynutit hodnoty polí Priority a Section.\n"
-"\n"
-"Podobně umí apt-ftparchive vygenerovat ze stromu souborů .dsc soubory\n"
-"Sources. Volbou --source-override můžete zadat zdrojový soubor override.\n"
-"\n"
-"Příkazy „packages“ a „sources“ by se měly spouštět z kořene stromu.\n"
-"BinárníCesta by měla ukazovat na začátek rekurzivního hledání a soubor \n"
-"override by měl obsahovat příznaky pro přepis. PrefixCesty, pokud je\n"
-"přítomen, je přidán do polí Filename.\n"
-"Reálný příklad na archivu Debianu:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Volby:\n"
-"  -h          Tato nápověda\n"
-"  --md5       Vygeneruje kontrolní MD5\n"
-"  -s=?        Zdrojový soubor override\n"
-"  -q          Tichý režim\n"
-"  -d=?        Vybere volitelnou databázi pro vyrovnávací paměť\n"
-"  --no-delink Povolí ladicí režim\n"
-"  --contents  Vygeneruje soubor Contents\n"
-"  -c=?        Načte tento konfigurační soubor\n"
-"  -o=?        Nastaví libovolnou volbu"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Žádný výběr nevyhověl"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Některé soubory chybí v balíkovém souboru skupiny %s"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB je porušená, soubor přejmenován na %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB je stará, zkouším aktualizovat %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi "
-"prosím odstraňte a poté ji znovu vytvořte."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nelze otevřít DB soubor %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Nelze vyhodnotit %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Archiv nemá kontrolní záznam"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Nelze získat kurzor"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Nelze číst adresář %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Nelze vyhodnotit %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Chyby se týkají souboru "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Chyba při zjišťování %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Průchod stromem selhal"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Nelze otevřít %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "Odlinkování %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Nelze přečíst link %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Nelze odlinkovat %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Nezdařilo se slinkovat %s s %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Odlinkovací limit %sB dosažen.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Archiv nemá pole Package"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s nemá žádnou položku pro override\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  správce %s je %s, ne %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s nemá žádnou zdrojovou položku pro override\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s nemá ani žádnou binární položku pro override\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Selhal pokus o přidělení paměti"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Nelze otevřít %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Zkomolený override soubor %s, řádek %llu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nezdařilo se přečíst override soubor %s"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Zkomolený override soubor %s, řádek %llu #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Zkomolený override soubor %s, řádek %llu #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Zkomolený override soubor %s, řádek %llu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Neznámý kompresní algoritmus „%s“"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimovaný výstup %s potřebuje kompresní sadu"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Selhalo vytvoření FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Volání fork() se nezdařilo"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Komprimovat potomka"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Interní chyba, nezdařilo se vytvořit %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "V/V operace s podprocesem/souborem selhala"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Chyba čtení při výpočtu MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problém s odlinkováním %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Selhalo přejmenování %s na %s"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Použití: apt-internal-solver\n"
-"\n"
-"apt-internal-solver je rozhraní k aktuálnímu internímu řešiteli\n"
-"závislostí, jako by šlo o externí nástroj - vhodné pro ladění\n"
-"\n"
-"Volby:\n"
-"  -h   Tato nápověda.\n"
-"  -q   Nezobrazí indikátor postupu - vhodné pro záznam\n"
-"  -c=? Načte daný konfigurační soubor\n"
-"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Neznámý záznam o balíku!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Použití: apt-sortpkgs [volby] soubor1 [soubor2 …]\n"
-"\n"
-"apt-sortpkgs je jednoduchý nástroj pro setřídění souborů Packages.\n"
-"Volbou -s volíte typ souboru.\n"
-"\n"
-"Volby:\n"
-"  -h   Tato nápověda\n"
-"  -s   Setřídí zdrojový soubor\n"
-"  -c=? Načte tento konfigurační soubor\n"
-"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Selhalo vytvoření roury"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Selhalo spuštění gzipu "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Porušený archiv"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Kontrolní součet taru selhal, archiv je poškozený"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Neznámá hlavička TARu typ %u, člen %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Neplatný podpis archivu"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Chyba při čtení záhlaví prvku archivu"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Neplatné záhlaví prvku archivu %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Neplatné záhlaví prvku archivu"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Archiv je příliš krátký"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Chyba při čtení hlaviček archivu"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "Pokus o uvolnění uzlu (DropNode) na stále propojeném uzlu"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Nelze lokalizovat hashovací prvek!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Nelze alokovat diverzi"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Vnitřní chyba při AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Pokus o přepsání diverze, %s -> %s a %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dvojí přidání diverze %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Duplicitní konfigurační soubor %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Selhal zápis souboru %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Selhalo zavření souboru %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Cesta %s je příliš dlouhá"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Rozbaluji %s vícekrát"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Adresář %s je odkloněn"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Balík se pokouší zapisovat do diverzního cíle %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Diverzní cesta je příliš dlouhá"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Nelze vyhodnotit %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Selhalo přejmenování %s na %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Adresář %s bude nahrazen neadresářem"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Nelze nalézt uzel v jeho hashovacím kbelíku"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Cesta je příliš dlouhá"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Přepsat vyhovující balík bez udání verze pro %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nelze vyhodnotit %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Selhal zápis souboru %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Selhalo zavření souboru %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Toto není platný DEB archiv, chybí část „%s“"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Vnitřní chyba, nemohu najít část %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Nezpracovatelný kontrolní soubor"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Nelze provést mmap prázdného souboru"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Nelze duplikovat popisovač souboru %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Nešlo mmapovat %llu bajtů"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Nelze zavřít mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Nelze synchronizovat mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Nešlo mmapovat %lu bajtů"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Nelze zmenšit soubor"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Start. "
-"Současná hodnota: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr "Nelze zvýšit velikost MMapu, protože limit %lu bajtů již byl dosažen."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Nelze zvýšit velikost MMapu, protože automatické zvětšování bylo uživatelem "
-"zakázáno."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Neplatný podpis archivu"
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Chyba při čtení záhlaví prvku archivu"
 
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Selection %s not found"
-msgstr "Výběr %s nenalezen"
+msgid "Invalid archive member header %s"
+msgstr "Neplatné záhlaví prvku archivu %s"
 
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Nerozpoznaná zkratka typu: „%c“"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Neplatné záhlaví prvku archivu"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Otevírám konfigurační soubor %s"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Archiv je příliš krátký"
 
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem."
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Chyba při čtení hlaviček archivu"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaktická chyba %s:%u: Zkomolená značka"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Selhalo vytvoření roury"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Selhalo spuštění gzipu "
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Porušený archiv"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, 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-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Kontrolní součet taru selhal, archiv je poškozený"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Neznámá hlavička TARu typ %u, člen %s"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“"
+msgid "Unable to stat %s."
+msgstr "Nebylo možno vyhodnotit %s."
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Syntaktická chyba %s:%u: Direktiva clear vyžaduje jako argument strom "
-"možností"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, 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í"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s… Chyba!"
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s… Hotovo"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr "…"
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s… %u%%"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Parametr příkazové řádky „%c“ [z %s] je neznámý"
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Nerozumím parametru %s příkazové řádky"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Parametr příkazové řádky %s není pravdivostní hodnota"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Volba %s vyžaduje argument."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Parametr %s: Zadání konfigurační položky musí obsahovat =<hodn>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Volba %s vyžaduje jako argument celé číslo (integer), ne „%s“"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Volba „%s“ je příliš dlouhá"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Nechápu význam %s, zkuste true nebo false."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Neplatná operace %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Nelze vyhodnotit přípojný bod %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Nezdařilo se vyhodnotit cdrom"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problém při zavírání gzip souboru %s"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Nešlo otevřít zámkový soubor %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Nelze získat zámek %s"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Seznam souborů nelze vytvořit, jelikož „%s“ není adresář"
-
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Ignoruji „%s“ v adresáři „%s“, jelikož to není obyčejný soubor"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Spouštím dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož nemá příponu"
+msgid "Packaging system '%s' is not supported"
+msgstr "Balíčkovací systém „%s“ není podporován"
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož má neplatnou příponu"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Nebylo možno určit vhodný typ balíčkovacího systému"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Podproces %s obdržel chybu segmentace."
+msgid "Wrote %i records.\n"
+msgstr "Zapsáno %i záznamů.\n"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Podproces %s obdržel signál %u."
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Zapsáno %i záznamů s chybějícími soubory (%i).\n"
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Podproces %s vrátil chybový kód (%u)"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Podproces %s neočekávaně skončil"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open file %s"
-msgstr "Nelze otevřít soubor %s"
+msgid "Can't find authentication record for: %s"
+msgstr "Nelze najít autentizační záznam pro: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Nelze otevřít popisovač souboru %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Nelze vytvořit podproces IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Nezdařilo se spustit kompresor "
+msgid "Hash mismatch for: %s"
+msgstr "Neshoda kontrolních součtů pro: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "čtení, stále mám k přečtení %llu, ale už nic nezbývá"
+msgid "The method driver %s could not be found."
+msgstr "Ovladač metody %s nemohl být nalezen."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "zápis, stále mám %llu k zápisu, ale nejde to"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "Problém při zavírání souboru %s"
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nebyla spuštěna správně"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problém při přejmenování souboru %s na %s"
+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/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problém při odstraňování souboru %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"Seznamy balíků nebo stavový soubor nemohly být zpracovány nebo otevřeny."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problém při synchronizování souboru"
+#: apt-pkg/cachefile.cc:98
+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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s není nainstalována žádná klíčenka."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Nelze přečíst seznam zdrojů."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Cache balíků je prázdná"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Cache soubor balíků je poškozen"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Cache soubor balíků má nekompatibilní verzi"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Cache soubor balíků je poškozen, je příliš malý"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Cache balíků byla vytvořena pro jinou architekturu"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Závisí na"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Předzávisí na"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Doporučuje"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Nahrazuje"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Zastarává"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Porušuje"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Rozšiřuje"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "důležitý"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "vyžadovaný"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "standardní"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "volitelný"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Vytváří se strom závislostí"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Kandidátské verze"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Generování závislostí"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Čtu stavové informace"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nelze otevřít stavový soubor %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nelze zapsat dočasný stavový soubor %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nelze zpracovat soubor %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nelze zpracovat soubor %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Otevírám %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Nelze spustit okamžitou konfiguraci balíku „%s“. Podrobnosti naleznete v man "
-"5 apt.conf v části APT::Immediate-Configure. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nelze nastavit „%s“."
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Tento běh instalace si vyžádá dočasné odstranění klíčového balíku %s kvůli "
-"smyčce v Conflicts/Pre-Depends. To je často špatné, ale pokud to skutečně "
-"chcete udělat, aktivujte možnost APT::Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indexový typ souboru „%s“ není podporován"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
-"podrženými balíky."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Adresář seznamů %spartial chybí."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Archivní adresář %spartial chybí."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nelze uzamknout adresář %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Stahuji soubor %li z %li (%s zbývá)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Stahuji soubor %li z %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ovladač metody %s nemohl být nalezen."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nebyla spuštěna správně"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Balíčkovací systém „%s“ není podporován"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Nebylo možno určit vhodný typ balíčkovacího systému"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nebylo možno vyhodnotit %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Do sources.list musíte zadat „zdrojové“ URI"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Seznamy balíků nebo stavový soubor nemohly být zpracovány nebo otevřeny."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Nelze přečíst seznam zdrojů."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"Hodnota „%s“ není v APT::Default-Release platná, protože toto vydání není "
-"dostupné v sources.list"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Neplatný záznam v souboru preferencí %s, chybí hlavička Package"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Nerozumím vypíchnutí typu %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Cache má nekompatibilní systém správy verzí"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Chyba při zpracování %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Wow, překročili jste počet jmen balíků, které tato APT umí zpracovat."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Wow, překročili jste počet verzí, které tato APT umí zpracovat."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Wow, překročili jste počet popisů, které tato APT umí zpracovat."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Wow, překročili jste počet závislostí, které tato APT umí zpracovat."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Při zpracování závislostí nebyl nalezen balík %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Čtu seznamy balíků"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Collecting File poskytuje"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nelze zapsat do %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Chyba IO při ukládání zdrojové cache"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Scénář odeslán řešiteli"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Požadavek odeslán řešiteli"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Příprava na obdržení řešení"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Spuštění externího řešitele"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "přejmenování selhalo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Neshoda kontrolních součtů"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Velikosti nesouhlasí"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Neplatná operace %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3042,16 +2202,16 @@ msgstr ""
 "V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list "
 "nebo porušený soubor)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "V souboru Release nelze najít kontrolní součet „%s“"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3060,12 +2220,12 @@ msgstr ""
 "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto "
 "repositáře se nepoužijí."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3075,12 +2235,12 @@ msgstr ""
 "se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Chyba GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3089,83 +2249,146 @@ msgstr ""
 "Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento "
 "balík je třeba opravit ručně (kvůli chybějící architektuře)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nelze zpracovat Release soubor %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Blok výrobce %s neobsahuje otisk klíče"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Release soubor %s neobsahuje žádné sekce"
+msgid "List directory %spartial is missing."
+msgstr "Adresář seznamů %spartial chybí."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release soubor %s neobsahuje Hash záznam"
+msgid "Archives directory %spartial is missing."
+msgstr "Archivní adresář %spartial chybí."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Neplatná položka „Valid-Until“ v Release souboru %s"
+msgid "Unable to lock directory %s"
+msgstr "Nelze uzamknout adresář %s"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Stahuji soubor %li z %li (%s zbývá)"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Neplatná položka „Date“ v Release souboru %s"
+msgid "Retrieving file %li of %li"
+msgstr "Stahuji soubor %li z %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Některé indexové soubory se nepodařilo stáhnout. Jsou ignorovány, nebo jsou "
+"použity starší verze."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Do sources.list musíte zadat „zdrojové“ URI"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Blok výrobce %s neobsahuje otisk klíče"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"Hodnota „%s“ není v APT::Default-Release platná, protože toto vydání není "
+"dostupné v sources.list"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Neplatný záznam v souboru preferencí %s, chybí hlavička Package"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Nerozumím vypíchnutí typu %s"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Nelze spustit okamžitou konfiguraci balíku „%s“. Podrobnosti naleznete v man "
+"5 apt.conf v části APT::Immediate-Configure. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nelze nastavit „%s“."
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Tento běh instalace si vyžádá dočasné odstranění klíčového balíku %s kvůli "
+"smyčce v Conflicts/Pre-Depends. To je často špatné, ale pokud to skutečně "
+"chcete udělat, aktivujte možnost APT::Force-LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Odpojuji CD-ROM…\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Používám přípojný bod %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Odpojuji CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Čekám na disk…\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Připojuji CD-ROM…\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Rozpoznávám… "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Uložený název: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Odpojuji CD-ROM…\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Hledám na disku indexové soubory…\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3174,7 +2397,7 @@ msgstr ""
 "Nalezeny indexy balíků (%zu), indexy zdrojů (%zu), indexy popisů (%zu) a "
 "podpisy (%zu)\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3182,16 +2405,16 @@ msgstr ""
 "Nenalezeny žádné balíky. Možná to není disk s Debianem, nebo je pro jinou "
 "architekturu?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Nalezený název: „%s“\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Nejedná se o platné jméno, zkuste to znovu.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3200,79 +2423,103 @@ msgstr ""
 "Tento disk se nazývá: \n"
 "„%s“\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Kopíruji seznamy balíků…"
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Zapisuji nový seznam balíků\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Seznamy zdrojů na tomto disku jsou:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Zapsáno %i záznamů.\n"
+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/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Zapsáno %i záznamů s chybějícími soubory (%i).\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
+"podrženými balíky."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu."
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytváří se strom závislostí"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidátské verze"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generování závislostí"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Čtu stavové informace"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n"
+msgid "Failed to open StateFile %s"
+msgstr "Nelze otevřít stavový soubor %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nelze zapsat dočasný stavový soubor %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Nelze najít autentizační záznam pro: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Nelze zpracovat soubor %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Neshoda kontrolních součtů pro: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Nelze zpracovat soubor %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nelze najít úlohu „%s“"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Nelze vybrat verze balíku „%s“, protože je čistě virtuální"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3281,171 +2528,234 @@ msgstr ""
 "Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože "
 "žádné takové verze nemá"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "Nelze vybrat nejnovější verzi balíku „%s“, protože je čistě virtuální"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "Nelze vybrat kandidátskou verzi balíku %s, protože žádnou nemá"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "Nelze vybrat nainstalované verze balíku %s, protože není nainstalován"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Scénář odeslán řešiteli"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nelze zpracovat Release soubor %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Požadavek odeslán řešiteli"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Release soubor %s neobsahuje žádné sekce"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Příprava na obdržení řešení"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Release soubor %s neobsahuje Hash záznam"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Neplatná položka „Valid-Until“ v Release souboru %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Spuštění externího řešitele"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Neplatná položka „Date“ v Release souboru %s"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Spouštím dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Některé indexové soubory se nepodařilo stáhnout. Jsou ignorovány, nebo jsou "
-"použity starší verze."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Otevírám %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Instaluji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraňuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Kompletně odstraňuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Značím si zmizení %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Spouštím poinstalační spouštěč %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresář „%s“ chybí"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nelze otevřít soubor „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Připravuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaluji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Připravuji nastavení %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Nainstalován %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Připravuji odstranění %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Připravuji úplné odstranění %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Kompletně odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Nelze zapsat do %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "Operace byla přerušena dříve, než mohla skončit"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "problémy se závislostmi - ponechávám nezkonfigurované"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3453,7 +2763,7 @@ msgstr ""
 "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
 "se jedná o chybu způsobenou předchozí chybou."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3461,7 +2771,7 @@ msgstr ""
 "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
 "je chyba způsobena zcela zaplněným diskem."
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3469,7 +2779,7 @@ msgstr ""
 "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
 "je chyba způsobena zcela zaplněnou pamětí."
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3478,37 +2788,761 @@ msgstr ""
 "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
 "je chyba způsobena zcela zaplněným diskem."
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje "
 "chybu V/V dpkg."
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr "Nelze uzamknout administrační adresář (%s). Používá jej jiný proces?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nelze uzamknout administrační adresář (%s). Jste root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%s“."
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Není uzamčen"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Výběr %s nenalezen"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Nešlo otevřít zámkový soubor %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Nelze získat zámek %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "Seznam souborů nelze vytvořit, jelikož „%s“ není adresář"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "Ignoruji „%s“ v adresáři „%s“, jelikož to není obyčejný soubor"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož nemá příponu"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož má neplatnou příponu"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Podproces %s obdržel chybu segmentace."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Podproces %s obdržel signál %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Podproces %s neočekávaně skončil"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problém při zavírání gzip souboru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Nelze otevřít soubor %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nelze otevřít popisovač souboru %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Nelze vytvořit podproces IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Nezdařilo se spustit kompresor "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "čtení, stále mám k přečtení %llu, ale už nic nezbývá"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "zápis, stále mám %llu k zápisu, ale nejde to"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problém při zavírání souboru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problém při přejmenování souboru %s na %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problém při odstraňování souboru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problém při synchronizování souboru"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s… Chyba!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s… Hotovo"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr "…"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Nelze provést mmap prázdného souboru"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Nelze duplikovat popisovač souboru %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Nešlo mmapovat %llu bajtů"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Nelze zavřít mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Nelze synchronizovat mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nešlo mmapovat %lu bajtů"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Nelze zmenšit soubor"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Start. "
+"Současná hodnota: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr "Nelze zvýšit velikost MMapu, protože limit %lu bajtů již byl dosažen."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Nelze zvýšit velikost MMapu, protože automatické zvětšování bylo uživatelem "
+"zakázáno."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Nelze vyhodnotit přípojný bod %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Nezdařilo se vyhodnotit cdrom"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Nerozpoznaná zkratka typu: „%c“"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Otevírám konfigurační soubor %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaktická chyba %s:%u: Zkomolená značka"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Syntaktická chyba %s:%u: Direktiva clear vyžaduje jako argument strom "
+"možností"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, 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í"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s není nainstalována žádná klíčenka."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Parametr příkazové řádky „%c“ [z %s] je neznámý"
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Nerozumím parametru %s příkazové řádky"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Parametr příkazové řádky %s není pravdivostní hodnota"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Volba %s vyžaduje argument."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Parametr %s: Zadání konfigurační položky musí obsahovat =<hodn>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Volba %s vyžaduje jako argument celé číslo (integer), ne „%s“"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Volba „%s“ je příliš dlouhá"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Nechápu význam %s, zkuste true nebo false."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Neplatná operace %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Použití: apt-extracttemplates soubor1 [soubor2 …]\n"
+"\n"
+"apt-extracttemplates umí z balíků vytáhnout konfigurační skripty a šablony\n"
+"\n"
+"Volby:\n"
+"  -h   Tato nápověda.\n"
+"  -t   Nastaví dočasný adresář\n"
+"  -c=? Načte tento konfigurační soubor\n"
+"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nelze vyhodnotit %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Seznam rozšíření balíku je příliš dlouhý"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Chyba zpracování adresáře %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Seznam zdrojových rozšíření je příliš dlouhý"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Chyba při zapisování hlavičky do souboru"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Chyba při zpracovávání obsahu %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Použití: apt-ftparchive [volby] příkaz\n"
+"Příkazy: packages binárnícesta [souboroverride [prefixcesty]]\n"
+"         sources zdrojovácesta [souboroverride [prefixcesty]]\n"
+"         contents cesta\n"
+"         release cesta\n"
+"         generate konfiguračnísoubor [skupiny]\n"
+"         clean konfiguračnísoubor\n"
+"\n"
+"apt-ftparchive generuje indexové soubory debianích archivů. Podporuje\n"
+"několik režimů vytváření - od plně automatického až po funkční ekvivalent\n"
+"příkazů dpkg-scanpackages a dpkg-scansources.\n"
+"\n"
+"apt-ftparchive vytvoří ze stromu .deb souborů soubory Packages. Soubor\n"
+"Packages obsahuje kromě všech kontrolních polí každého balíku také jeho\n"
+"velikost a MD5 součet. Podporován je také soubor override, kterým můžete \n"
+"vynutit hodnoty polí Priority a Section.\n"
+"\n"
+"Podobně umí apt-ftparchive vygenerovat ze stromu souborů .dsc soubory\n"
+"Sources. Volbou --source-override můžete zadat zdrojový soubor override.\n"
+"\n"
+"Příkazy „packages“ a „sources“ by se měly spouštět z kořene stromu.\n"
+"BinárníCesta by měla ukazovat na začátek rekurzivního hledání a soubor \n"
+"override by měl obsahovat příznaky pro přepis. PrefixCesty, pokud je\n"
+"přítomen, je přidán do polí Filename.\n"
+"Reálný příklad na archivu Debianu:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Volby:\n"
+"  -h          Tato nápověda\n"
+"  --md5       Vygeneruje kontrolní MD5\n"
+"  -s=?        Zdrojový soubor override\n"
+"  -q          Tichý režim\n"
+"  -d=?        Vybere volitelnou databázi pro vyrovnávací paměť\n"
+"  --no-delink Povolí ladicí režim\n"
+"  --contents  Vygeneruje soubor Contents\n"
+"  -c=?        Načte tento konfigurační soubor\n"
+"  -o=?        Nastaví libovolnou volbu"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Žádný výběr nevyhověl"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Některé soubory chybí v balíkovém souboru skupiny %s"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB je porušená, soubor přejmenován na %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je stará, zkouším aktualizovat %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi "
+"prosím odstraňte a poté ji znovu vytvořte."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nelze otevřít DB soubor %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Archiv nemá kontrolní záznam"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Nelze získat kurzor"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Nelze číst adresář %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Nelze vyhodnotit %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Chyby se týkají souboru "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Chyba při zjišťování %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Průchod stromem selhal"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Nelze otevřít %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr "Odlinkování %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Nelze přečíst link %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Nelze odlinkovat %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Nezdařilo se slinkovat %s s %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Odlinkovací limit %sB dosažen.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Archiv nemá pole Package"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr " %s nemá žádnou položku pro override\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  správce %s je %s, ne %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr " %s nemá žádnou zdrojovou položku pro override\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr " %s nemá ani žádnou binární položku pro override\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Selhal pokus o přidělení paměti"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nelze otevřít %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Zkomolený override soubor %s, řádek %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nezdařilo se přečíst override soubor %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Zkomolený override soubor %s, řádek %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Zkomolený override soubor %s, řádek %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Zkomolený override soubor %s, řádek %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Neznámý kompresní algoritmus „%s“"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimovaný výstup %s potřebuje kompresní sadu"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Selhalo vytvoření FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Volání fork() se nezdařilo"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Komprimovat potomka"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Interní chyba, nezdařilo se vytvořit %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "V/V operace s podprocesem/souborem selhala"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Chyba čtení při výpočtu MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problém s odlinkováním %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Použití: apt-internal-solver\n"
+"\n"
+"apt-internal-solver je rozhraní k aktuálnímu internímu řešiteli\n"
+"závislostí, jako by šlo o externí nástroj - vhodné pro ladění\n"
+"\n"
+"Volby:\n"
+"  -h   Tato nápověda.\n"
+"  -q   Nezobrazí indikátor postupu - vhodné pro záznam\n"
+"  -c=? Načte daný konfigurační soubor\n"
+"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Neznámý záznam o balíku!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Použití: apt-sortpkgs [volby] soubor1 [soubor2 …]\n"
+"\n"
+"apt-sortpkgs je jednoduchý nástroj pro setřídění souborů Packages.\n"
+"Volbou -s volíte typ souboru.\n"
+"\n"
+"Volby:\n"
+"  -h   Tato nápověda\n"
+"  -s   Setřídí zdrojový soubor\n"
+"  -c=? Načte tento konfigurační soubor\n"
+"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s není platný DEB balík."
 
diff --git a/po/cy.po b/po/cy.po
index 7920dbb9a..2e1caf53f 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -15,173 +15,174 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 #, fuzzy
 msgid "Total package names: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 #, fuzzy
 msgid "  Normal packages: "
 msgstr "  Pecynnau Normal: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 #, fuzzy
 msgid "  Pure virtual packages: "
 msgstr "  Pecynnau Cwbl Rhithwir: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 #, fuzzy
 msgid "  Single virtual packages: "
 msgstr "  Pecynnau Rhithwir Sengl: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "  Mixed virtual packages: "
 msgstr "  Pecynnau Rhithwir Cymysg: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Ar Goll: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 #, fuzzy
 msgid "Total distinct versions: "
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 #, fuzzy
 msgid "Total dependencies: "
 msgstr "Cyfanswm Dibyniaethau: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 #, fuzzy
 msgid "Total ver/file relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total Provides mappings: "
 msgstr "Cyfanswm Mapiau Darpariath: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 #, fuzzy
 msgid "Total globbed strings: "
 msgstr "Cyfanswm Llinynau Glob: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 #, fuzzy
 msgid "Total dependency version space: "
 msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 #, fuzzy
 msgid "Total slack space: "
 msgstr "Cyfanswm gofod Slac: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 #, fuzzy
 msgid "Total space accounted for: "
 msgstr "Cyfanswm Gofod Cyfrifwyd: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Canfuwyd dim pecyn"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Rhaid i chi ddarparu un patrwm yn union"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ni ellir lleoli'r pecyn %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 #, fuzzy
 msgid "Package files:"
 msgstr "Ffeiliau Pecynnau:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 #, fuzzy
 msgid "Pinned packages:"
 msgstr "Pecynnau wedi eu Pinio:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(heb ganfod)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Wedi Sefydlu: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Ymgeisydd: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(dim)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 #, fuzzy
 msgid "  Package pin: "
 msgstr "  Pin Pecyn: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 #, fuzzy
 msgid "  Version table:"
 msgstr "  Tabl Fersiynnau:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -254,19 +255,11 @@ msgstr ""
 "  -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-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 #, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
@@ -274,12 +267,20 @@ msgstr ""
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Methwyd ailenwi %s at %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -316,66 +317,66 @@ msgstr ""
 "  -c=? Darllen y ffeil cyfluniad\n"
 "  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
@@ -395,96 +396,96 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, 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:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, 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:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, fuzzy, c-format
 msgid "Fetch source %s\n"
 msgstr "Cyrchu Ffynhonell %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -493,7 +494,7 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -502,14 +503,14 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -518,7 +519,7 @@ 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:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -527,32 +528,32 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Yn cysylltu i %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -639,53 +640,74 @@ msgstr ""
 "\n"
 "                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ond nid yw wedi ei sefydlu"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, fuzzy, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Arhoswyd am %s ond nid oedd e yna"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Methwyd agor %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -712,7 +734,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -764,52 +786,52 @@ msgstr ""
 msgid "Disk not found."
 msgstr "Ffeil heb ei ganfod"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Ffeil heb ei ganfod"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Methwyd stat()"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Methwyd gosod amser newid"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Yn mewngofnodi"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Ni ellir darganfod enw'r cymar"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Ni ellir darganfod yr enw lleol"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, fuzzy, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -818,124 +840,126 @@ msgstr ""
 "ProxyLogin yn wag.)"
 
 # FIXME
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Goramser cysylltu"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Caeodd y gweinydd y cysylltiad"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Gwall darllen"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Gorlifodd ateb y byffer."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Llygr protocol"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Gwall ysgrifennu"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Methwyd creu soced"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Methwyd"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 #, fuzzy
 msgid "Could not connect passive socket."
 msgstr "Methwyd cysylltu soced goddefol"
 
 # FIXME
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Methodd getaddrinfo gael soced gwrando"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Methwyd rhwymo soced"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Methwyd gwrando ar y soced"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Methwyd canfod enw'r soced"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Methwyd danfod gorchymyn PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Goramserodd cysylltiad y soced data"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Goramserodd soced data"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Ymholiad"
 
 # FIXME
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Methwyd gweithredu "
 
@@ -971,7 +995,7 @@ msgstr "Methwyd cysylltu i %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Yn cysylltu i %s"
@@ -1001,190 +1025,430 @@ 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:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 #, 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:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Methwyd dewis"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Yn aros am benawdau"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Llinell pennawd gwael"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 #, fuzzy
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 #, fuzzy
 msgid "This HTTP server has broken range support"
 msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Fformat dyddiad anhysbys"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Gwall mewnol"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+#, fuzzy
+msgid "Calculating upgrade... "
+msgstr "Yn Cyfrifo'r Uwchraddiad... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Wedi Gorffen"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " wedi methu."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Wedi Gorffen"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "ond nid yw'n mynd i gael ei sefydlu"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " neu"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+
+#: apt-private/private-output.cc:537
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+
+#: apt-private/private-output.cc:558
+#, fuzzy
+msgid "The following packages will be upgraded:"
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+
+#: apt-private/private-output.cc:579
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (oherwydd %s) "
+
+#: apt-private/private-output.cc:662
+#, fuzzy
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
+"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
+"ei wneud!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "I"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 #, fuzzy
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Mae angen cyrchu %sB o archifau.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Does dim digon o le rhydd gennych yn %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Ie, gwna fel rydw i'n dweud!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1195,19 +1459,19 @@ msgstr ""
 "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
 " ?]"
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Erthylu."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Ydych chi eisiau mynd ymlaen?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1215,20 +1479,20 @@ msgstr ""
 "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
 "geidio defnyddio --fix-missing?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Ni ellir cywiro pecynnau ar goll."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 #, fuzzy
 msgid "Aborting install."
 msgstr "Yn Erthylu'r Sefydliad."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1238,15 +1502,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1262,16 +1526,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1281,7 +1545,7 @@ msgid_plural ""
 msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1289,18 +1553,18 @@ msgid_plural ""
 msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1309,7 +1573,7 @@ msgstr ""
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1321,326 +1585,94 @@ msgstr ""
 "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
 "heb gael eu symud allan o Incoming."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 #, fuzzy
 msgid "Some packages could not be authenticated"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr ""
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "ond mae %s wedi ei sefydlu"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "ond ni ellir ei sefydlu"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "ond mae'n becyn rhithwir"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "ond nid yw wedi ei sefydlu"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "ond nid yw'n mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " neu"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-
-#: apt-private/private-output.cc:506
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-
-#: apt-private/private-output.cc:527
-#, fuzzy
-msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-
-#: apt-private/private-output.cc:548
-#, fuzzy
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (oherwydd %s) "
-
-#: apt-private/private-output.cc:631
-#, fuzzy
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
-"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
-"ei wneud!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu wedi ailsefydlu, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu wedi eu israddio, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "I"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " wedi methu."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Wedi Gorffen"
-
-#: apt-private/private-cachefile.cc:102
-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."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-
-#: apt-private/private-upgrade.cc:19
-#, fuzzy
-msgid "Calculating upgrade... "
-msgstr "Yn Cyfrifo'r Uwchraddiad... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Wedi Gorffen"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Methwyd ailenwi %s at %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Presennol "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Cyrchu:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Anwybyddu "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Gwall "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Gweithio]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, fuzzy, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1653,19 +1685,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni ellir darllen %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ni ellir newid i %s"
@@ -1694,11 +1726,11 @@ msgstr "Methwyd agor ffeil %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Methwyd creu pibell cyfathrebu at isbroses"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Caewyd y cysylltiad yn gynnar"
 
@@ -1741,1360 +1773,461 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Yn cyfuno manylion Ar Gael"
 
-# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:224
-#, fuzzy
-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 ""
-"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
-"templed o becynnau Debian.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Dangos y testun cymorth hwn\n"
-"  -t   Gosod y cyfeiriadur dros dro\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ni ellir ysgrifennu i %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, fuzzy, c-format
-msgid "Error processing directory %s"
-msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, fuzzy, c-format
-msgid "Error processing contents %s"
-msgstr "Gwall wrth Brosesu Cynnwys %s"
-
-# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:597
-#, fuzzy
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
-"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
-"             sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n"
-"             contents llwybr\n"
-"             release llwybr\n"
-"             generate cyfluniad [grŵpiau]\n"
-"             clean cyfluniad\n"
-"\n"
-"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
-"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
-"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n"
-"\n"
-"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
-"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
-"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n"
-"gorfodi'r gwerthoedd Priority a Section.\n"
-"\n"
-"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n"
-".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n"
-"gwrthwneud ffynhonell.\n"
-"\n"
-"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n"
-"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n"
-"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n"
-"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n"
-"defnydd o'r archif Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opsiynnau:\n"
-"  -h          Y testun cymorth hwn\n"
-"  --md5       Rheoli cynhyrchiad stwnch MD5\n"
-"  -s=?        Ffeil gwrthwneud ffynhonell\n"
-"  -q          Tawel\n"
-"  -d=?        Dewis cronda data storfa opsiynnol\n"
-"  --no-delink Galluogi'r modd datgysylltu datnamu\n"
-"  --contents  Rheoli cynhyrchiad ffeil cynnwys\n"
-"  -c=?        Darllen y ffeil cyfluniad hwn\n"
-"  -o=?        Gosod opsiwn cyfluniad mympwyol"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Dim dewisiadau'n cyfateb"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn  `%s'"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ni ellir agor y ffeil DB2 %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Methodd stat() o %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Does dim cofnod rheoli gan yr archif"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Ni ellir cael cyrchydd"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "Rh: Ni ellir gwneud stat() o %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "G: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "Rh: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Methwyd datrys %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Methwyd cerdded y goeden"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Methwyd agor %s"
-
-# FIXME
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DatGysylltu %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Methwyd darllen y cyswllt %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Methwyd datgysylltu %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Methwyd cysylltu %s at %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Doedd dim maes pecyn gan yr archif"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Cynaliwr %s yw %s nid %s\n"
-
-#: ftparchive/writer.cc:712
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
-
-#: ftparchive/writer.cc:716
-#, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Methwyd neilltuo cof"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Ni ellir agor %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Methwydd darllen y ffeil dargyfeirio %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, fuzzy, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Dull Cywasgu Anhysbys '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Methwyd creu FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Methodd fork()"
-
-#: ftparchive/multicompress.cc:207
-#, fuzzy
-msgid "Compress child"
-msgstr "Plentyn Cywasgu"
-
-#: ftparchive/multicompress.cc:230
-#, fuzzy, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Gwall Mewnol, Methwyd creu %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Methodd MA i isbroses/ffeil"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Methwyd darllen wrth gyfrifo MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Gwall wrth datgysylltu %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Methwyd ailenwi %s at %s"
-
-# FIXME: "debian"
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
-"templed o becynnau Debian.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Dangos y testun cymorth hwn\n"
-"  -t   Gosod y cyfeiriadur dros dro\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Cofnod pecyn anhysbys!"
-
-#: cmdline/apt-sortpkgs.cc:153
-#, fuzzy
-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 ""
-"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
-"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Y testun cymorth hwn\n"
-"  -s   Defnyddio trefnu ffeil ffynhonell\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Methwyd creu pibau"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Methwyd gweithredu gzip"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Archif llygredig"
-
-#: apt-inst/contrib/extracttar.cc:201
-#, fuzzy
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Methodd swm gwirio Tar, archif llygredig"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Math pennawd TAR anhysbys %u, aelod %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Llofnod archif annilys"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Gwall wrth ddarllen pennawd aelod archif"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Pennawd aelod archif annilys"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Pennawd aelod archif annilys"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Mae'r archif yn rhy fyr"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Methwyd darllen pennawdau'r archif"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Methyd lleoli yr elfen <hash>!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Methwyd neilltuo dargyfeiriad"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 #, fuzzy
 msgid "Internal error in AddDiversion"
 msgstr "Gwall Mewnol yn AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
 
 # FIXME: "the"
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Ffeil cyfluniad dyblyg %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Methwyd cau ffeil %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Mae'r llwybr %s yn rhy hir"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Yn dadbacio %s mwy nag unwaith"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Methodd stat() o %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Methwyd ailenwi %s at %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Mae'r llwybr yn rhy hir"
 
 # FIXME: wtf?
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Ni ellir gwneud stat() o %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Methwyd cau ffeil %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, fuzzy, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 #, fuzzy
 msgid "Unparsable control file"
 msgstr "Ffeil rheoli ni ellir ei ramadegu"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Llofnod archif annilys"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Methwyd agor pibell ar gyfer %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Gwall wrth ddarllen pennawd aelod archif"
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Methwyd gwneud mmap() efo %lu beit"
-
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Ni ellir agor %s"
-
-# FIXME
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Methwyd gweithredu "
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Methwyd gwneud mmap() efo %lu beit"
-
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Methwyd ysgrifennu ffeil %s"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+msgid "Invalid archive member header %s"
+msgstr "Pennawd aelod archif annilys"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Pennawd aelod archif annilys"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Mae'r archif yn rhy fyr"
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Methwyd darllen pennawdau'r archif"
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Methwyd creu pibau"
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Ni chanfuwyd y dewis %s"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Methwyd gweithredu gzip"
 
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Talgryniad math anhysbys: '%c'"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Archif llygredig"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#: apt-inst/contrib/extracttar.cc:203
+#, fuzzy
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Methodd swm gwirio Tar, archif llygredig"
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-inst/contrib/extracttar.cc:308
 #, 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:804
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Math pennawd TAR anhysbys %u, aelod %s"
 
-#: apt-pkg/contrib/configuration.cc:821
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."
 
-#: apt-pkg/contrib/configuration.cc:861
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
-
-#: apt-pkg/contrib/configuration.cc:868
-#, 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:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
-"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
+msgid "Packaging system '%s' is not supported"
+msgstr "Ni chynhelir y system pecynnu '%s'"
 
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Gwall!"
+#: apt-pkg/init.cc:162
+#, fuzzy
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Ni ellir canfod math system addas"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Wedi Gorffen"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Wedi Gorffen"
-
-# FIXME
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:304
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Opsiwn '%s' yn rhy hir"
-
-# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Gweithred annilys %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Methwyd gwneud stat() o'r CD-ROM"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Gwall wrth gau'r ffeil"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Methwyd agor y ffeil clo %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Methwyd cael y clo %s"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
+msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Derbyniodd is-broses %s wall segmentu."
-
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Derbyniodd is-broses %s wall segmentu."
+msgid "Hash mismatch for: %s"
+msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Gorffenodd is-broses %s yn annisgwyl"
+msgid "Is the package %s installed?"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Could not open file %s"
-msgstr "Methwyd agor ffeil %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Methwyd agor pibell ar gyfer %s"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Methwyd creu isbroses IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Methwyd gweithredu cywasgydd "
-
-# FIXME
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "o hyd %lu i ddarllen ond dim ar ôl"
-
-# FIXME
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "o hyd %lu i ysgrifennu ond methwyd"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Gwall wrth gau'r ffeil"
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Gwall wrth gyfamseru'r ffeil"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Gwall wrth dadgysylltu'r ffeil"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Gwall wrth gyfamseru'r ffeil"
+#: apt-pkg/cachefile.cc:98
+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."
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Yn Erthylu'r Sefydliad."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Methwyd darllen y rhestr ffynhonellau."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Storfa pecyn gwag"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Mae'r ffeil storfa pecyn yn llygredig"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Mae'r ffeil storfa pecyn yn llygredig"
 
 # FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Dibynnu"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "CynDdibynnu"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Awgrymu"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Argymell"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Gwrthdaro"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Amnewid"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Darfodi"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "pwysig"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "angenrheidiol"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "safonnol"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "opsiynnol"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "ychwanegol"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-#, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
-
-#: apt-pkg/depcache.cc:133
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
-
-#: apt-pkg/depcache.cc:162
-#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-#, fuzzy
-msgid "Reading state information"
-msgstr "Yn cyfuno manylion Ar Gael"
-
-#: apt-pkg/depcache.cc:244
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
-
-# FIXME: number?
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Yn agor %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
-
-#: apt-pkg/sourcelist.cc:366
-#, fuzzy, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Methwyd agor ffeil %s"
-
-# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
-"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
-"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Ni chynhelir y math ffeil mynegai '%s'"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
-"ei gyfer."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
-"ei achosi gan pecynnau wedi eu dal."
-
-#: apt-pkg/algorithms.cc:1070
-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/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
-
-#: apt-pkg/acquire.cc:895
-#, fuzzy, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Yn Darllen Rhestr Ffeiliau"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
-
-#: apt-pkg/acquire-worker.cc:115
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
-
-#: apt-pkg/acquire-worker.cc:452
-#, fuzzy, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Ni chynhelir y system pecynnu '%s'"
-
-#: apt-pkg/init.cc:159
-#, fuzzy
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Ni ellir canfod math system addas"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
-
-# FIXME: ...file
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
-
-#: apt-pkg/cachefile.cc:91
-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."
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Methwyd darllen y rhestr ffynhonellau."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-# FIXME: literal
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-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:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Methwyd daeall y math pin %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Mae can y storfa system fersiwn anghyfaddas"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 #, fuzzy
 msgid "Reading package lists"
 msgstr "Yn Darllen Rhestrau Pecynnau"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Yn Casglu Darpariaethau Ffeil"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ni ellir ysgrifennu i %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "methwyd ailenwi, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Gweithred annilys %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3102,28 +2235,28 @@ msgid ""
 msgstr ""
 
 # FIXME: number?
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3131,13 +2264,13 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
 # FIXME: case
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3146,413 +2279,1313 @@ msgstr ""
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
 
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgid "List directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+msgid "Archives directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:901
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+msgid "Retrieving file %li of %li"
+msgstr "Yn Darllen Rhestr Ffeiliau"
 
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
+"rai eu defnyddio yn lle."
+
+# FIXME: ...file
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+# FIXME: literal
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
 
-#: apt-pkg/vendorlist.cc:78
+# FIXME: tense
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
+msgid "Did not understand pin type %s"
+msgstr "Methwyd daeall y math pin %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
 #, c-format
-msgid "Using CD-ROM mount point %s\n"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Methwyd agor ffeil %s"
+
+# FIXME: %s may have an arbirrary length
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
+"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
+"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
 
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+
+#: apt-pkg/cdrom.cc:571
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD Anghywir"
+
+#: apt-pkg/cdrom.cc:586
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:599
 #, fuzzy
 msgid "Waiting for disc...\n"
 msgstr "Yn aros am benawdau"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD Anghywir"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 #, fuzzy
 msgid "Copying package lists..."
 msgstr "Yn Darllen Rhestrau Pecynnau"
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 #, fuzzy
 msgid "Writing new source list\n"
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
+"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
+"ei gyfer."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
+"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
+"ei achosi gan pecynnau wedi eu dal."
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+#: apt-pkg/algorithms.cc:1088
+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/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+#, fuzzy
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/depcache.cc:168
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"
+
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Camgyfatebiaeth swm MD5"
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
+# FIXME: number?
+#: apt-pkg/tagfile.cc:140
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Methwyd canfod pecyn %s"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Methwyd canfod pecyn %s"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Methwyd canfod pecyn %s"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
-"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
-"rai eu defnyddio yn lle."
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+
+#: apt-pkg/sourcelist.cc:375
+#, fuzzy, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Yn cysylltu i %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Methwyd agor ffeil %s"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Argymell"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Ni ellir ysgrifennu i %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Methwyd agor y ffeil clo %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Methwyd cael y clo %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Derbyniodd is-broses %s wall segmentu."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Derbyniodd is-broses %s wall segmentu."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Gorffenodd is-broses %s yn annisgwyl"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Gwall wrth gau'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Methwyd agor ffeil %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Methwyd agor pibell ar gyfer %s"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Methwyd creu isbroses IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Methwyd gweithredu cywasgydd "
+
+# FIXME
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "o hyd %lu i ddarllen ond dim ar ôl"
+
+# FIXME
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "o hyd %lu i ysgrifennu ond methwyd"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Gwall wrth gau'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Gwall wrth gyfamseru'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Gwall wrth dadgysylltu'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Gwall wrth gyfamseru'r ffeil"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Gwall!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Wedi Gorffen"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Wedi Gorffen"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Methwyd agor pibell ar gyfer %s"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Ni ellir agor %s"
+
+# FIXME
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Methwyd gweithredu "
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"
+
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Methwyd gwneud stat() o'r CD-ROM"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Talgryniad math anhysbys: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Yn Erthylu'r Sefydliad."
+
+# FIXME
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opsiwn '%s' yn rhy hir"
+
+# FIXME: 'Sense'?
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Gweithred annilys %s"
+
+# FIXME: "debian"
+#: cmdline/apt-extracttemplates.cc:224
+#, fuzzy
+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 ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Dangos y testun cymorth hwn\n"
+"  -t   Gosod y cyfeiriadur dros dro\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ni ellir gwneud stat() o %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, fuzzy, c-format
+msgid "Error processing directory %s"
+msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, fuzzy, c-format
+msgid "Error processing contents %s"
+msgstr "Gwall wrth Brosesu Cynnwys %s"
+
+# FIXME: full stops
+#: ftparchive/apt-ftparchive.cc:606
+#, fuzzy
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
+"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+"             sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+"             contents llwybr\n"
+"             release llwybr\n"
+"             generate cyfluniad [grŵpiau]\n"
+"             clean cyfluniad\n"
+"\n"
+"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
+"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
+"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n"
+"\n"
+"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
+"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
+"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n"
+"gorfodi'r gwerthoedd Priority a Section.\n"
+"\n"
+"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n"
+".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n"
+"gwrthwneud ffynhonell.\n"
+"\n"
+"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n"
+"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n"
+"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n"
+"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n"
+"defnydd o'r archif Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opsiynnau:\n"
+"  -h          Y testun cymorth hwn\n"
+"  --md5       Rheoli cynhyrchiad stwnch MD5\n"
+"  -s=?        Ffeil gwrthwneud ffynhonell\n"
+"  -q          Tawel\n"
+"  -d=?        Dewis cronda data storfa opsiynnol\n"
+"  --no-delink Galluogi'r modd datgysylltu datnamu\n"
+"  --contents  Rheoli cynhyrchiad ffeil cynnwys\n"
+"  -c=?        Darllen y ffeil cyfluniad hwn\n"
+"  -o=?        Gosod opsiwn cyfluniad mympwyol"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Dim dewisiadau'n cyfateb"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn  `%s'"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ni ellir agor y ffeil DB2 %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Does dim cofnod rheoli gan yr archif"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Ni ellir cael cyrchydd"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "Rh: Ni ellir gwneud stat() o %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "G: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "Rh: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Methwyd datrys %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Methwyd cerdded y goeden"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Methwyd agor %s"
+
+# FIXME
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DatGysylltu %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Methwyd darllen y cyswllt %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Methwyd datgysylltu %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Methwyd cysylltu %s at %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Doedd dim maes pecyn gan yr archif"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  Cynaliwr %s yw %s nid %s\n"
+
+#: ftparchive/writer.cc:721
+#, fuzzy, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+
+#: ftparchive/writer.cc:725
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Methwyd neilltuo cof"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ni ellir agor %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Methwydd darllen y ffeil dargyfeirio %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, fuzzy, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Dull Cywasgu Anhysbys '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Methwyd creu FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Methodd fork()"
+
+#: ftparchive/multicompress.cc:209
+#, fuzzy
+msgid "Compress child"
+msgstr "Plentyn Cywasgu"
+
+#: ftparchive/multicompress.cc:232
+#, fuzzy, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Gwall Mewnol, Methwyd creu %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Methodd MA i isbroses/ffeil"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Methwyd darllen wrth gyfrifo MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Gwall wrth datgysylltu %s"
+
+# FIXME: "debian"
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Dangos y testun cymorth hwn\n"
+"  -t   Gosod y cyfeiriadur dros dro\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Cofnod pecyn anhysbys!"
+
+#: cmdline/apt-sortpkgs.cc:153
+#, fuzzy
+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 ""
+"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
+"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Y testun cymorth hwn\n"
+"  -s   Defnyddio trefnu ffeil ffynhonell\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "Nid yw %s yn becyn DEB dilys."
 
diff --git a/po/da.po b/po/da.po
index 05b80b394..9885cedd0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2013-12-14 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -20,155 +20,156 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Samlet antal pakkenavne: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Samlet antal pakkestrukturer: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Normale pakker: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Rene virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Enkelte virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Blandede virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Manglende: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Totale forskellige versioner: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Sammenlagt forskellige beskrivelser: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Sammenlagt afhængigheder: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Sammenlagt version/fil-relationer: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Sammenlagt version/fil-relationer: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Sammenlagt »Tilbyder«-markeringer: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Totalle søgemønsterstrenge: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Total afhængighedsversions-plads: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Total »Slack«-plads: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Total plads, der kan gøres rede for: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefilen %s er ude af trit."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Fandt ingen pakker"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Du skal angive mindst ét søgemønster"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Denne kommando er forældet. Brug venligst »apt-mark showauto« i stedet for."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kunne ikke lokalisere pakken %s"
 
 # Overskriften til apt-cache policy,
 # forkorter "Package" væk. CH
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "»Pinned« pakker:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(ikke fundet)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Installeret: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Pakke-pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Versionstabel:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s kompileret på %s %s\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -238,33 +239,34 @@ msgstr ""
 "  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
 "Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-"Der kunne ikke detekteres et cd-rom-drev eller findes et monteringspunkt.\n"
-"Du kan prøve tilvalget --cdrom for at angive cd-rom-monteringspunktet. Se "
-"»man apt-cdrom« for yderligere information om automatisk detektering af cd-"
-"rom og monteringspunkt."
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Angiv venligst et navn for denne disk, som f.eks. »Debian 5.0.3 Disk 1«"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Indsæt en disk i drevet og tryk retur"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Kunne ikke montere %s til %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+#, fuzzy
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+"Der kunne ikke detekteres et cd-rom-drev eller findes et monteringspunkt.\n"
+"Du kan prøve tilvalget --cdrom for at angive cd-rom-monteringspunktet. Se "
+"»man apt-cdrom« for yderligere information om automatisk detektering af cd-"
+"rom og monteringspunkt."
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Gentag processen for resten af cd'erne i dit sæt."
 
@@ -300,47 +302,47 @@ msgstr ""
 "  -c=? Læs denne opsætningsfil\n"
 "  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Kan ikke finde en pakke for arkitektur »%s«"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Kan ikke finde en pakke »%s« med version »%s«"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Kan ikke finde en pakke »%s« med udgivelse »%s«"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Vælger »%s« som kildepakke fremfor »%s«\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Kan ikke finde version »%s« for pakke »%s«"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunne ikke finde pakken %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s sat til manuelt installeret.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s sat til automatisk installation.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -348,19 +350,19 @@ msgstr ""
 "Denne kommando er forældet. Brug venligst »apt-mark auto« og »apt-mark "
 "manual« i stedet for."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern fejl. Problemløseren ødelagde noget"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Kunne ikke låse nedhentningsmappen"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunne ikke finde kildetekstpakken for %s"
@@ -385,78 +387,78 @@ msgstr ""
 "bzr branch %s\n"
 "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Overspringer allerede hentet fil »%s«\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunne ikke bestemme ledig plads i %s"
 
-#: cmdline/apt-get.cc:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Henter kildetekst %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Nogle arkiver kunne ikke hentes."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Nedhentning afsluttet i »hent-kun«-tilstand"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Udpakningskommandoen »%s« fejlede.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Opbygningskommandoen »%s« fejlede.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Barneprocessen fejlede"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -465,17 +467,17 @@ msgstr ""
 "Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::"
 "Architectures for opsætning"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen opbygningsafhængigheder.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -483,7 +485,7 @@ msgid ""
 msgstr ""
 "Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -491,14 +493,14 @@ msgid ""
 msgstr ""
 "Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -507,7 +509,7 @@ msgstr ""
 "Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige "
 "kandidater for pakken %s kan tilfredsstille versionskravene"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -516,30 +518,30 @@ msgstr ""
 "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en "
 "kandidatversion"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Kunne ikke behandler opbygningsafhængighederne"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Ændringslog for %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Understøttede moduler:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -627,53 +629,74 @@ msgstr ""
 "for flere oplysninger og tilvalg.\n"
 "                       Denne APT har »Super Cow Powers«.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s kan ikke markeres, da den ikke er installeret.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s var allerede sat til manuelt installeret.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s var allerede sat til automatisk installeret.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s var allerede sat i bero.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s var allerede ikke i bero.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventede på %s, men den var der ikke"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s sat i bero.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Afbrød i bero for %s.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Kørsel af dpkg fejlede. Er du root (administrator)?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -721,7 +744,7 @@ msgstr ""
 "tmp\n"
 "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 #, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
@@ -783,52 +806,52 @@ msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug."
 msgid "Disk not found."
 msgstr "Disk blev ikke fundet."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Fil blev ikke fundet"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Kunne ikke finde"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Kunne ikke angive ændringstidspunkt"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ugyldig URI, lokale URI'er må ikke starte med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Logget på"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Kunne ikke bestemme serverens navn"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Kunne ikke bestemme det lokale navn"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Serveren nægtede os forbindelse og sagde: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "angivelse af brugernavn mislykkedes, serveren sagde: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "angivelse af adgangskode mislykkedes, serveren sagde: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -836,121 +859,123 @@ msgstr ""
 "Der blev angivet en proxyserver men intet logpå-skript; Acquire::ftp::"
 "ProxyLogin er tom."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Logpå-skriptets kommando »%s« mislykkedes. Serveren sagde: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislykkedes. Serveren sagde: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Tidsudløb på forbindelsen"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Serveren lukkede forbindelsen"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Læsefejl"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Mellemlageret blev overfyldt af et svar."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Protokolfejl"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Skrivefejl"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Kunne ikke oprette sokkel"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Mislykkedes"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Kunne ikke forbinde passiv sokkel."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo kunne ikke få en lyttesokkel"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Kunne ikke tilknytte en sokkel"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Kunne ikke lytte på soklen"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Kunne ikke finde soklens navn"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Kunne ikke sende PORT-kommando"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukendt adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislykkedes. Serveren sagde: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Tidsudløb på datasokkel-forbindelse"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problem ved \"hashing\" af fil"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kunne ikke hente fil. Serveren sagde »%s«"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Tidsudløb ved datasokkel"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverførsel mislykkedes, serveren sagde »%s«"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Forespørgsel"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Kunne ikke udføre "
 
@@ -986,7 +1011,7 @@ msgstr "Kunne ikke forbinde til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Forbinder til %s"
@@ -1016,23 +1041,23 @@ msgstr "Der skete noget underligt under opløsning af »%s:%s« (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Kunne ikke forbinde til %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Stødte på mindst én ugyldig signatur."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kunne ikke køre »gpgv« for at verificere signaturen (er gpgv installeret?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1041,15 +1066,15 @@ msgstr ""
 "Clearsigned-fil er ikke gyldig, fik »%s« (kræver netværket ikke "
 "autentificering?)"
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Ukendt fejl ved kørsel af gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Følgende signaturer var ugyldige:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1057,148 +1082,379 @@ msgstr ""
 "Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er "
 "tilgængelig:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Tomme filer kan ikke være gyldige arkiver"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Fejl ved skrivning til filen"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Fejl ved læsning fra server"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Valg mislykkedes"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Tidsudløb på forbindelsen"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Afventer hoveder"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Ugyldig linje i hovedet"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-serveren sendte et ugyldigt svarhovede"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http-serveren sendte et ugyldigt Content-Length-hovede"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-serveren sendte et ugyldigt Content-Range-hovede"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr ""
 "Denne http-servere har fejlagtig understøttelse af intervaller (»ranges«)"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Ukendt datoformat"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Intern fejl"
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Beregner opgraderingen ... "
+
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Intern fejl, opgradering blev afbrudt"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Færdig"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr "Sortering"
+
 # måske visning, kategorisering
-#: apt-private/private-list.cc:147
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr "Listing"
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Retter afhængigheder ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislykkedes."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Kunne ikke rette afhængigheder"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunne ikke minimere opgraderingssættet"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Færdig"
+
+#: apt-private/private-cachefile.cc:108
+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«."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Uopfyldte afhængigheder. Prøv med -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "installeret,kan opgraderes til: "
+
+#: apt-private/private-output.cc:236
+msgid "[installed,local]"
+msgstr "[Installeret,lokalt]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr "[installeret,kan auto-fjernes]"
+
+#: apt-private/private-output.cc:241
+msgid "[installed,automatic]"
+msgstr "[Installeret,automatisk]"
+
+#: apt-private/private-output.cc:243
+msgid "[installed]"
+msgstr "[Installeret]"
+
+#: apt-private/private-output.cc:247
+#, fuzzy, c-format
+msgid "[upgradable from: %s]"
+msgstr "[kan opgraderes fra: "
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr "[residual-konfig]"
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uopfyldte afhængigheder:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installeret"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s forventes installeret"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "men den kan ikke installeres"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "men det er en virtuel pakke"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "men den er ikke installeret"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "men den bliver ikke installeret"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Følgende NYE pakker vil blive installeret:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Følgende pakker vil blive AFINSTALLERET:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Følgende pakker er blevet holdt tilbage:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Følgende pakker vil blive opgraderet:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Følgende pakker vil blive NEDGRADERET:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Følgende tilbageholdte pakker vil blive ændret:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (grundet %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
+"Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu opgraderes, %lu nyinstalleres, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu geninstalleres, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderes, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Fejl ved tolkning af regulært udtryk - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "»update«-kommandoen benytter ingen parametre"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "ikke en reel pakke (virtuel)"
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern fejl. Sortering blev ikke fuldført"
 
-#: apt-private/private-install.cc:159
-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"
+#: apt-private/private-install.cc:147
+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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%sB/%sB skal hentes fra arkiverne.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%sB skal hentes fra arkiverne.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har ikke nok ledig plads i %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Der er problemer og -y blev brugt uden --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "»Trivial Only« angivet, men dette er ikke en triviel handling."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Ja, gør som jeg siger!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1209,19 +1465,19 @@ msgstr ""
 "For at fortsætte, skal du skrive »%s«\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Afbryder."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Vil du fortsætte?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Nedhentningen af filer mislykkedes"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1229,19 +1485,19 @@ msgstr ""
 "Kunne ikke hente nogle af arkiverne. Prøv evt. at køre »apt-get update« "
 "eller prøv med --fix-missing."
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing og medieskift understøttes endnu ikke"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Kunne ikke rette manglende pakker."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Afbryder installationen."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1255,17 +1511,17 @@ msgstr[1] ""
 "De følgende pakker forsvandt fra dit system, da\n"
 "alle filer er blevet overskrevet af andre pakker:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 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"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1283,15 +1539,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern fejl. AutoRemover ødelagde noget"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1302,7 +1558,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Følgende pakker blev installeret automatisk, og behøves ikke længere:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1311,17 +1567,17 @@ msgstr[0] "Pakken %lu blev installeret automatisk, og behøves ikke længere.\n"
 msgstr[1] ""
 "Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Brug »apt-get autoremove« til at fjerne den."
 msgstr[1] "Brug »apt-get autoremove« til at fjerne dem."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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«:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1329,7 +1585,7 @@ msgstr ""
 "Uopfyldte afhængigheder. Prøv »apt-get -f install« uden pakker (eller angiv "
 "en løsning)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1340,318 +1596,96 @@ msgstr ""
 "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
 "pakker endnu ikke er lavet eller gjort tilgængelige."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Følgende yderligere pakker vil blive installeret:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Foreslåede pakker:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Anbefalede pakker:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"BEMÆRK: Dette er kun en simulering!\n"
+"    apt-get kræver rootprivilegier for reel kørsel.\n"
+"    Husk også at låsning er deaktiveret,\n"
+"    så stol ikke på relevansen for den reelle aktuelle situation!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Autentifikationsadvarsel tilsidesat.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Nogle pakker kunne ikke autentificeres"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Installér disse pakker uden verifikation?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Kunne ikke hente %s %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "installeret,kan opgraderes til: "
-
-#: apt-private/private-output.cc:205
-msgid "[installed,local]"
-msgstr "[Installeret,lokalt]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr "[installeret,kan auto-fjernes]"
-
-#: apt-private/private-output.cc:210
-msgid "[installed,automatic]"
-msgstr "[Installeret,automatisk]"
-
-#: apt-private/private-output.cc:212
-msgid "[installed]"
-msgstr "[Installeret]"
-
-#: apt-private/private-output.cc:216
-#, fuzzy, c-format
-msgid "[upgradable from: %s]"
-msgstr "[kan opgraderes fra: "
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr "[residual-konfig]"
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uopfyldte afhængigheder:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installeret"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s forventes installeret"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "men den kan ikke installeres"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "men det er en virtuel pakke"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "men den er ikke installeret"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "men den bliver ikke installeret"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Følgende NYE pakker vil blive installeret:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Følgende pakker vil blive AFINSTALLERET:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Følgende pakker er blevet holdt tilbage:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Følgende pakker vil blive opgraderet:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Følgende pakker vil blive NEDGRADERET:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Følgende tilbageholdte pakker vil blive ændret:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (grundet %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
-"Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu opgraderes, %lu nyinstalleres, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu geninstalleres, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderes, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Fejl ved tolkning af regulært udtryk - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Retter afhængigheder ..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " mislykkedes."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Kunne ikke rette afhængigheder"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunne ikke minimere opgraderingssættet"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Færdig"
-
-#: apt-private/private-cachefile.cc:102
-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«."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Uopfyldte afhængigheder. Prøv med -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr "Sortering"
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "»update«-kommandoen benytter ingen parametre"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Beregner opgraderingen ... "
-
-#: apt-private/private-upgrade.cc:24
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Intern fejl, opgradering blev afbrudt"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Færdig"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr "Fuldtekst-søgning"
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr "ikke en reel pakke (virtuel)"
-
-#: apt-private/private-main.cc:19
-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 ""
-"BEMÆRK: Dette er kun en simulering!\n"
-"    apt-get kræver rootprivilegier for reel kørsel.\n"
-"    Husk også at låsning er deaktiveret,\n"
-"    så stol ikke på relevansen for den reelle aktuelle situation!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Kunne ikke fortolke %s. Rediger igen? "
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr "Din »%s« fil blev ændret, kør venligst »apt-get update«."
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr "Fuldtekst-søgning"
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Havde "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Henter:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ignorerer "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Fejl "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Hentede %sB på %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Arbejder]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1664,19 +1698,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunne ikke læse %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kunne ikke skifte til %s"
@@ -1705,11 +1739,11 @@ msgstr "Ingen post fundet i spejlfil »%s«"
 msgid "[Mirror: %s]"
 msgstr "[Spejl: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Kunne ikke oprette IPC-videreførsel til underproces"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen lukkedes for hurtigt"
 
@@ -1752,1323 +1786,445 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sammenfletter tilgængelighedsoplysninger"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Brug: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates er et værktøj til at uddrage opsætnings- og skabelon-"
-"oplysninger fra Debianpakker\n"
-"\n"
-"Tilvalg:\n"
-"  -h   Denne hjælpetekst\n"
-"  -t   Angiv temp-mappe\n"
-"  -c=? Læs denne opsætningsfil\n"
-"  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kunne ikke skrive til %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Kan ikke finde debconfs version. Er debconf installeret?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Pakkeudvidelseslisten er for lang"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Fejl under behandling af mappen %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Kildeudvidelseslisten er for lang"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Fejl under skrivning af hovedet til indholdsfil"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Fejl under behandling af indhold %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Brug: apt-ftparchive [tilvalg] kommando\n"
-"Kommandoer: packges binærsti [tvangsfil [sti]]\n"
-"            sources kildesti [tvangsfil [sti]]\n"
-"            contents sti\n"
-"            release sti\n"
-"            generate config [grupper]\n"
-"            clean config\n"
-"\n"
-"apt-ftparchive laver indeksfiler til Debianarkiver. Det understøtter \n"
-"mange former for generering, lige fra fuldautomatiske til funktionelle\n"
-"erstatninger for dpkg-scanpackages og dpkg-scansources\n"
-"\n"
-"apt-ftparchive genererer Package-filer ud fra træer af .deb'er.\n"
-"Package-filen indeholder alle styrefelterne fra hver pakke såvel\n"
-"som MD5-mønstre og filstørrelser. En tvangsfil understøttes til at\n"
-"gennemtvinge indholdet af Priority og Section.\n"
-"\n"
-"På samme måde genererer apt-ftparchive Sources-filer ud fra træer\n"
-"med .dsc'er. Tvangstilvalget --source-override kan bruges til at\n"
-"angive en src-tvangsfil.\n"
-"\n"
-"Kommandoerne »packages« og »sources« skal køres i roden af træet.\n"
-"binærsti skal pege på basen af rekursive søgninger og tvangsfilen\n"
-"skal indeholde tvangsflagene. Sti foranstilles eventuelle\n"
-"filnavnfelter. Et eksempel på brug fra Debianarkivet:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Tilvalg:\n"
-"  -h    Denne hjælpetekst\n"
-"  --md5 Styr generering af MD5\n"
-"  -s=?  Kilde-tvangsfil\n"
-"  -q    Stille\n"
-"  -d=?  Vælg den valgfrie mellemlager-database\n"
-"  --no-delink Aktivér \"delinking\"-fejlsporingstilstand\n"
-"  --contents  Bestem generering af indholdsfil\n"
-"  -c=?  Læs denne opsætningsfil\n"
-"  -o=?  Sæt en opsætnings-indstilling"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Ingen valg passede"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Visse filer mangler i pakkefilgruppen »%s«"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB var ødelagt, filen omdøbt til %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB er gammel, forsøger at opgradere %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Databaseformatet er ugyldigt. Hvis du har opgraderet fra en ældre version af "
-"apt, så fjern og genskab databasen."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Kunne ikke åbne DB-filen %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Kunne ikke finde %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Arkivet har ingen kontrolindgang"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Kunne skaffe en markør"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Kunne ikke læse mappen %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Kunne ikke finde %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "F: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "A: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "F: Fejlene vedrører filen "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Kunne ikke omsætte navnet %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Trævandring mislykkedes"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Kunne ikke åbne %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Kunne ikke »readlink« %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Kunne ikke frigøre %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Kunne ikke lænke %s til %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Nåede DeLink-begrænsningen på %sB.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Arkivet havde intet package-felt"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har ingen tvangs-post\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  pakkeansvarlig for %s er %s, ikke %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr ""
-"  %s har ingen linje med tilsidesættelse af standard for binøre filer\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Kunne ikke allokere hukommelse"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Kunne ikke åbne %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Ugyldig gennemtvangs %s-linje %llu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Kunne ikke læse gennemtvangsfilen %s"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Ugyldig gennemtvangs %s-linje %llu #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Ugyldig gennemtvangs %s-linje %llu #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Ugyldig gennemtvangs %s-linje %llu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Ukendt komprimeringsalgoritme »%s«"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimerede uddata %s kræver et komprimeringssæt"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Kunne ikke oprette FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Kunne ikke spalte"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Komprimer barn"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Intern fejl. Kunne ikke oprette %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "IO til underproces/fil mislykkedes"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Kunne ikke læse under beregning af MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem under aflænkning af %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Kunne ikke omdøbe %s til %s"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Brug: apt-internal-solver\n"
-"\n"
-"apt-internal-solver er en grænseflade, der skal bruge den aktuelle\n"
-"interne som en ekstern problemløser for APT-familien for fejlsøgning\n"
-"eller lignende\n"
-"\n"
-"Tilvalg:\n"
-" -h   Denne hjælpetekst.\n"
-" -q   Logbare uddata - ingen statusindikator\n"
-" -c=? Læs denne konfigurationsfil\n"
-" -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Ukendt pakkeindgang!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Brug: apt-sortpkgs [tilvalg] fil1 [fil2 ...]\n"
-"\n"
-"apt-sortpkgs er et simpelt værktøj til at sortere pakkefiler. Tilvalget -s\n"
-"bruges til at angive filens type.\n"
-"\n"
-"Tilvalg:\n"
-"  -h   Denne hjælpetekst\n"
-"  -s   Benyt kildefils-sortering\n"
-"  -c=? Læs denne opsætningsfil\n"
-"  -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Kunne ikke oprette videreførsler"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Kunne ikke udføre gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Ødelagt arkiv"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-tjeksum fejlede, arkivet er ødelagt"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Ukendt TAR-hovedtype %u, element %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Ugyldig arkivsignatur"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Fejl under læsning af arkivelements hoved"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ugyldigt arkivelementhoved %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Ugyldigt arkivelementhoved"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arkivet er for kort"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Kunne ikke læse arkivhovederne"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode kaldt med endnu forbundet knude"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Kunne ikke finde hash-element!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Kunne ikke allokere omrokering"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Intern fejl i AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Forsøger at overskrive en omrokering, %s -> %s og %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dobbelt tilføjelse af omrokering %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Dobbelt opsætningsfil %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Kunne ikke skrive filen %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Kunne ikke lukke filen %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Stien %s er for lang"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Pakkede %s ud flere gange"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Mappen %s er omrokeret"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Pakken forsøger at skrive til omrokeret mål %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Omrokeringsstien er for lang"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Kunne ikke finde %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Kunne ikke omdøbe %s til %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Mappen %s bliver erstattet af en ikke-mappe"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Kunne ikke finde knuden i sin hash-bucket"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Stien er for lang"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Overskriv pakkematch uden version for %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "File %s/%s overskriver filen i pakken %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Kunne ikke finde %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Kunne ikke skrive filen %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Kunne ikke lukke filen %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler »%s«-elementet"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Intern fejl, kunne ikke finde elementet %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Ikke-tolkbar kontrolfil"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Kan ikke udføre mmap for en tom fil"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Kunne ikke duplikere filbeskrivelse %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Kunne ikke udføre mmap for %llu byte"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Kunne ikke lukke mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Kunne ikke synkronisere mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Kunne ikke udføre mmap for %lu byte"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Kunne ikke afkorte filen"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-Start. "
-"Aktuel værdi: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Kunne ikke øge størrelsen på MMap da begrænsningen på %lu byte allerede er "
-"nået."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Kunne ikke øge størrelsen på MMap da automatisk øgning er deaktiveret af "
-"bruger."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Det valgte %s blev ikke fundet"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Ukendt type-forkortelse: »%c«"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Åbner konfigurationsfilen %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, 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:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaksfejl %s:%u: Forkert udformet mærke"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, 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:861
-#, 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:868
-#, 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:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaksfejl %s:%u: Inkluderet herfra"
-
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv »%s«"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "Syntaksfejl %s:%u: ryd direktiv kræver et tilvalgstræ som argument"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Fejl!"
-
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Færdig"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr "..."
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... %u%%"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Kommandolinjetilvalget »%c« [fra %s] kendes ikke."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Kommandolinjetilvalget %s blev ikke forstået"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Kommandolinjetilvalget %s er ikke boolsk"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Tilvalget %s kræver et parameter."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Tilvalg %s: Opsætningspostens specifikation skal have en =<værdi>."
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ugyldig arkivsignatur"
 
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Tilvalget %s kræver et heltalligt parameter, ikke »%s«"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Fejl under læsning af arkivelements hoved"
 
-#: apt-pkg/contrib/cmndline.cc:304
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Tilvalget »%s« er for langt"
+msgid "Invalid archive member header %s"
+msgstr "Ugyldigt arkivelementhoved %s"
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "%s blev ikke forstået, prøv med »true« eller »false«."
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ugyldigt arkivelementhoved"
 
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Ugyldig handling %s"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arkivet er for kort"
 
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Kunne ikke finde monteringspunktet %s"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Kunne ikke læse arkivhovederne"
 
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Kunne ikke finde cdrommen"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Kunne ikke oprette videreførsler"
 
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problem under lukning af gzip-filen %s"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Kunne ikke udføre gzip "
 
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Benytter ikke låsning for skrivebeskyttet låsefil %s"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Ødelagt arkiv"
 
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Kunne ikke åbne låsefilen %s"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar-tjeksum fejlede, arkivet er ødelagt"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Benytter ikke låsning for nfs-monteret låsefil %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Ukendt TAR-hovedtype %u, element %s"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Could not get lock %s"
-msgstr "Kunne ikke opnå låsen %s"
+msgid "Unable to stat %s."
+msgstr "Kunne ikke finde %s."
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Liste over filer kan ikke oprettes da »%s« ikke er en mappe"
+msgid "Progress: [%3i%%]"
+msgstr "Status: [%3i%%]"
 
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Ignorerer »%s« i mappe »%s« da det ikke er en regulær fil"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Kører dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "Ignorerer fil »%s« i mappe »%s« da den ikke har en filendelse"
+msgid "Packaging system '%s' is not supported"
+msgstr "Pakkesystemet »%s« understøttes ikke"
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr "Ignorerer fil »%s« i mappe »%s« da den har en ugyldig filendelse"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Kunne ikke bestemme en passende pakkesystemtype"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Underprocessen %s modtog en segmenteringsfejl."
+msgid "Wrote %i records.\n"
+msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Underprocessen %s modtog en signal %u."
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Skrev %i poster med %i manglende filer.\n"
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Underprocessen %s returnerede en fejlkode (%u)"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Skrev %i poster med %i ikke-trufne filer\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Underprocessen %s afsluttedes uventet"
+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"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open file %s"
-msgstr "Kunne ikke åbne filen %s"
+msgid "Can't find authentication record for: %s"
+msgstr "Kan ikke finde godkendelsesregistrering for: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Kunne ikke åbne filbeskrivelse %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Kunne ikke oprette underproces IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Kunne ikke udføre komprimeringsprogram "
+msgid "Hash mismatch for: %s"
+msgstr "Hashsum stemmer ikke: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "læs, mangler stadig at læse %llu men der er ikke flere"
+msgid "The method driver %s could not be found."
+msgstr "Metodedriveren %s blev ikke fundet."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "skriv, mangler stadig at skrive %llu men kunne ikke"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Tjek om pakken »dpkg-dev« er installeret.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "Problem under lukning af filen %s"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startede ikke korrekt"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problem under omdøbning af filen %s til %s"
+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/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Fejl ved frigivelse af filen %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller åbnes."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problem under synkronisering af fil"
+#: apt-pkg/cachefile.cc:98
+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«"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nøglering installeret i %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Listen med kilder kunne ikke læses."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Tomt pakke-mellemlager"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Pakke-mellemlagerets fil er ødelagt"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Pakke-mellemlagerets fil er af en inkompatibel version"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Pakke-mellemlagerets fil er ødelagt, den er for lille"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Denne APT understøtter ikke versionssystemet »%s«"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Pakke-mellemlageret er lavet til en anden arkitektur"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Afhængigheder"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Præ-afhængigheder"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Foreslåede"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Anbefalede"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Overflødiggør"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Ødelægger"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Forbedringer"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "vigtig"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "krævet"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "frivillig"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Opbygger afhængighedstræ"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Kandidatversioner"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Afhængighedsgenerering"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Læser tilstandsoplysninger"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Kunne ikke åbne StateFile %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Kunne ikke skrive den midlertidige StateFile %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Kunne ikke tolke pakkefilen %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Kunne ikke tolke pakkefilen %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Åbner %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linjen %u er for lang i kildelisten %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Ugyldig linje %u i kildelisten %s (type)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Kunne ikke udføre øjeblikkelig konfiguration på »%s«. Se venligst man 5 apt."
-"conf under APT:Immediate-Cinfigure for detaljer. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Kunne ikke åbne filen »%s«. "
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Kørsel af denne installation kræver midlertidig afinstallation af den "
-"essentielle pakke %s grundet en afhængighedsløkke. Det er ofte en dårlig "
-"ide, men hvis du virkelig vil gøre det, kan du aktivere valget »APT::Force-"
-"LoopBreak«."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indeksfiler af typen »%s« understøttes ikke"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes "
-"tilbageholdte pakker."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Listemappen %spartial mangler."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arkivmappen %spartial mangler."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Kunne ikke låse mappen %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Henter fil %li ud af %li (%s tilbage)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Henter fil %li ud af %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metodedriveren %s blev ikke fundet."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Tjek om pakken »dpkg-dev« er installeret.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startede ikke korrekt"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Pakkesystemet »%s« understøttes ikke"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Kunne ikke bestemme en passende pakkesystemtype"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunne ikke finde %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Du skal have nogle »source«-URI'er i din sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller åbnes."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Listen med kilder kunne ikke læses."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"Værdien »%s« er ugyldig for APT::Default-Release da sådan en udgivelse ikke "
-"er tilgængelig i kilderne"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Ugyldig indgang i indstillingsfilen %s, pakkehovedet mangler"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Kunne ikke forstå pin-type %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Der opstod en fejl under behandlingen af %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kunne ikke finde kildepakkelisten %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Indlæser pakkelisterne"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Samler filudbud"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kunne ikke skrive til %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "IO-fejl ved gemning af kilde-mellemlageret"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Send scenarie til problemløser"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Send forespørgsel til problemløser"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Forbered for modtagelse af løsning"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Kør ekstern problemløser"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "omdøbning mislykkedes, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Hashsum stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Størrelsen stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 msgid "Invalid file format"
 msgstr "Ugyldigt filformat"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3077,17 +2233,17 @@ msgstr ""
 "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-"
 "punkt eller forkert udformet fil)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3096,12 +2252,12 @@ msgstr ""
 "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette "
 "arkiv vil ikke blive anvendt."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3111,12 +2267,12 @@ msgstr ""
 "og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fejl: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3125,82 +2281,146 @@ msgstr ""
 "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
 "nødt til manuelt at reparere denne pakke. (grundet manglende arch)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Pakkeindeksfilerne er i stykker. Intet »Filename:«-felt for pakken %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kunne ikke fortolke udgivelsesfil %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Leverandørblok %s inderholder intet fingeraftryk"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Ingen afsnit i udgivelsesfil %s"
+msgid "List directory %spartial is missing."
+msgstr "Listemappen %spartial mangler."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Intet hashpunkt i udgivelsesfil %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Arkivmappen %spartial mangler."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
+msgid "Unable to lock directory %s"
+msgstr "Kunne ikke låse mappen %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Henter fil %li ud af %li (%s tilbage)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Leverandørblok %s inderholder intet fingeraftryk"
+msgid "Retrieving file %li of %li"
+msgstr "Henter fil %li ud af %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Nogle indeksfiler kunne ikke hentes. De er blevet ignoreret eller de gamle "
+"bruges i stedet."
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Du skal have nogle »source«-URI'er i din sources.list"
+
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr "Bruger cdrom-monteringspunktet %s\n"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"Værdien »%s« er ugyldig for APT::Default-Release da sådan en udgivelse ikke "
+"er tilgængelig i kilderne"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Ugyldig indgang i indstillingsfilen %s, pakkehovedet mangler"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Kunne ikke forstå pin-type %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Kunne ikke udføre øjeblikkelig konfiguration på »%s«. Se venligst man 5 apt."
+"conf under APT:Immediate-Cinfigure for detaljer. (%d)"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Afmonterer cdrom\n"
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Kunne ikke åbne filen »%s«. "
 
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Kørsel af denne installation kræver midlertidig afinstallation af den "
+"essentielle pakke %s grundet en afhængighedsløkke. Det er ofte en dårlig "
+"ide, men hvis du virkelig vil gøre det, kan du aktivere valget »APT::Force-"
+"LoopBreak«."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Linjen %u er for lang i kildelisten %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Afmonterer CD-ROM ...\n"
+
+#: apt-pkg/cdrom.cc:586
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Bruger CD-ROM-monteringspunktet %s\n"
+
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Venter på disken ...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
-msgstr "Monterer cdrom ...\n"
+msgstr "Monterer CD-ROM ...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "Identificerer .. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "Identificerer ... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Gemt mærkat: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Afmonterer cdrom ...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "Skanner disken for indeksfiler ..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "Skanner disken for indeksfiler ...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3209,7 +2429,7 @@ msgstr ""
 "Fandt %zu pakkeindekser, %zu kildeindekser, %zu oversættelsesindekser og %zu "
 "signaturer\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3217,16 +2437,16 @@ msgstr ""
 "Kunne ikke finde nogen pakkefiler, det er muligvis ikke en Debiandisk eller "
 "den forkerte arkitektur?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Fandt mærkatet »%s«\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Det er ikke et gyldigt navn, prøv igen.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3235,79 +2455,105 @@ msgstr ""
 "Denne disk hedder: \n"
 "»%s«\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Kopierer pakkelisterne ..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Skriver ny kildeliste\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Denne disk har følgende kildeliste-indgange:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Skrev %i poster.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Skrev %i poster med %i manglende filer.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes "
+"tilbageholdte pakker."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker."
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Opbygger afhængighedstræ"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidatversioner"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Afhængighedsgenerering"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Læser tilstandsoplysninger"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Skrev %i poster med %i ikke-trufne filer\n"
+msgid "Failed to open StateFile %s"
+msgstr "Kunne ikke åbne StateFile %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, 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"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Kunne ikke skrive den midlertidige StateFile %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Kan ikke finde godkendelsesregistrering for: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Kunne ikke tolke pakkefilen %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hashsum stemmer ikke: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Kunne ikke tolke pakkefilen %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Udgaven »%s« for »%s« blev ikke fundet"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versionen »%s« for »%s« blev ikke fundet"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Kunne ikke finde opgaven »%s«"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Kan ikke vælge versioner fra pakke »%s« som er vitalt"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3316,173 +2562,236 @@ msgstr ""
 "Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke "
 "har nogen af dem"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "Kan ikke vælge nyeste version fra pakke »%s« som er vital"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Kan ikke vælge kandidatversion fra pakke %s da den ikke har nogen kandidat"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Kan ikke vælge installeret version fra pakke %s da den ikke er installeret"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Send scenarie til problemløser"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Kunne ikke fortolke udgivelsesfil %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Send forespørgsel til problemløser"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Ingen afsnit i udgivelsesfil %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Forbered for modtagelse af løsning"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Intet hashpunkt i udgivelsesfil %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Kør ekstern problemløser"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr "Status: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Kører dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Nogle indeksfiler kunne ikke hentes. De er blevet ignoreret eller de gamle "
-"bruges i stedet."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Åbner %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Ugyldig linje %u i kildelisten %s (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Sætter %s op"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Fjerner %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Bemærker forsvinding af %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Kører førinstallationsudløser %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappe »%s« mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Kunne ikke åbne filen »%s«"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Klargør %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker %s ud"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Gør klar til at sætte %s op"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Installerede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Gør klar til afinstallation af %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Gør klar til at fjerne %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernede %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "Kan ikke skrive log (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr "Er /dev/pts monteret?"
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr "Er standardud en terminal?"
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "Handling blev afbrudt før den kunne afsluttes"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "afhængighedsproblemer - efterlader ukonfigureret"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3490,14 +2799,14 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
 "opfølgningsfejl fra en tidligere fejl."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3505,7 +2814,7 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
 "hukommelsesfejl"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3513,12 +2822,12 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale "
 "system"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3526,23 +2835,749 @@ msgid ""
 msgstr ""
 "Kunne ikke låse administrationsmappen (%s), bruger en anden proces den?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet."
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Ikke låst"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Det valgte %s blev ikke fundet"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Benytter ikke låsning for skrivebeskyttet låsefil %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Kunne ikke åbne låsefilen %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Benytter ikke låsning for nfs-monteret låsefil %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Kunne ikke opnå låsen %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "Liste over filer kan ikke oprettes da »%s« ikke er en mappe"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "Ignorerer »%s« i mappe »%s« da det ikke er en regulær fil"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr "Ignorerer fil »%s« i mappe »%s« da den ikke har en filendelse"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr "Ignorerer fil »%s« i mappe »%s« da den har en ugyldig filendelse"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Underprocessen %s modtog en segmenteringsfejl."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Underprocessen %s modtog en signal %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Underprocessen %s returnerede en fejlkode (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Underprocessen %s afsluttedes uventet"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problem under lukning af gzip-filen %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Kunne ikke åbne filen %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Kunne ikke åbne filbeskrivelse %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Kunne ikke oprette underproces IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Kunne ikke udføre komprimeringsprogram "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "læs, mangler stadig at læse %llu men der er ikke flere"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "skriv, mangler stadig at skrive %llu men kunne ikke"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problem under lukning af filen %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem under omdøbning af filen %s til %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Fejl ved frigivelse af filen %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problem under synkronisering af fil"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Fejl!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Færdig"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr "..."
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Kan ikke udføre mmap for en tom fil"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Kunne ikke duplikere filbeskrivelse %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Kunne ikke udføre mmap for %llu byte"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Kunne ikke lukke mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Kunne ikke synkronisere mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Kunne ikke udføre mmap for %lu byte"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Kunne ikke afkorte filen"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-Start. "
+"Aktuel værdi: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Kunne ikke øge størrelsen på MMap da begrænsningen på %lu byte allerede er "
+"nået."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Kunne ikke øge størrelsen på MMap da automatisk øgning er deaktiveret af "
+"bruger."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Kunne ikke finde monteringspunktet %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Kunne ikke finde cdrommen"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Ukendt type-forkortelse: »%c«"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Åbner konfigurationsfilen %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaksfejl %s:%u: Forkert udformet mærke"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaksfejl %s:%u: Inkluderet herfra"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv »%s«"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "Syntaksfejl %s:%u: ryd direktiv kræver et tilvalgstræ som argument"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nøglering installeret i %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Kommandolinjetilvalget »%c« [fra %s] kendes ikke."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Kommandolinjetilvalget %s blev ikke forstået"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Kommandolinjetilvalget %s er ikke boolsk"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Tilvalget %s kræver et parameter."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Tilvalg %s: Opsætningspostens specifikation skal have en =<værdi>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Tilvalget %s kræver et heltalligt parameter, ikke »%s«"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Tilvalget »%s« er for langt"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "%s blev ikke forstået, prøv med »true« eller »false«."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Ugyldig handling %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Brug: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates er et værktøj til at uddrage opsætnings- og skabelon-"
+"oplysninger fra Debianpakker\n"
+"\n"
+"Tilvalg:\n"
+"  -h   Denne hjælpetekst\n"
+"  -t   Angiv temp-mappe\n"
+"  -c=? Læs denne opsætningsfil\n"
+"  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Kunne ikke finde %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Kan ikke finde debconfs version. Er debconf installeret?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Pakkeudvidelseslisten er for lang"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Fejl under behandling af mappen %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Kildeudvidelseslisten er for lang"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Fejl under skrivning af hovedet til indholdsfil"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Fejl under behandling af indhold %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Brug: apt-ftparchive [tilvalg] kommando\n"
+"Kommandoer: packges binærsti [tvangsfil [sti]]\n"
+"            sources kildesti [tvangsfil [sti]]\n"
+"            contents sti\n"
+"            release sti\n"
+"            generate config [grupper]\n"
+"            clean config\n"
+"\n"
+"apt-ftparchive laver indeksfiler til Debianarkiver. Det understøtter \n"
+"mange former for generering, lige fra fuldautomatiske til funktionelle\n"
+"erstatninger for dpkg-scanpackages og dpkg-scansources\n"
+"\n"
+"apt-ftparchive genererer Package-filer ud fra træer af .deb'er.\n"
+"Package-filen indeholder alle styrefelterne fra hver pakke såvel\n"
+"som MD5-mønstre og filstørrelser. En tvangsfil understøttes til at\n"
+"gennemtvinge indholdet af Priority og Section.\n"
+"\n"
+"På samme måde genererer apt-ftparchive Sources-filer ud fra træer\n"
+"med .dsc'er. Tvangstilvalget --source-override kan bruges til at\n"
+"angive en src-tvangsfil.\n"
+"\n"
+"Kommandoerne »packages« og »sources« skal køres i roden af træet.\n"
+"binærsti skal pege på basen af rekursive søgninger og tvangsfilen\n"
+"skal indeholde tvangsflagene. Sti foranstilles eventuelle\n"
+"filnavnfelter. Et eksempel på brug fra Debianarkivet:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Tilvalg:\n"
+"  -h    Denne hjælpetekst\n"
+"  --md5 Styr generering af MD5\n"
+"  -s=?  Kilde-tvangsfil\n"
+"  -q    Stille\n"
+"  -d=?  Vælg den valgfrie mellemlager-database\n"
+"  --no-delink Aktivér \"delinking\"-fejlsporingstilstand\n"
+"  --contents  Bestem generering af indholdsfil\n"
+"  -c=?  Læs denne opsætningsfil\n"
+"  -o=?  Sæt en opsætnings-indstilling"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Ingen valg passede"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Visse filer mangler i pakkefilgruppen »%s«"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB var ødelagt, filen omdøbt til %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB er gammel, forsøger at opgradere %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Databaseformatet er ugyldigt. Hvis du har opgraderet fra en ældre version af "
+"apt, så fjern og genskab databasen."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Kunne ikke åbne DB-filen %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Arkivet har ingen kontrolindgang"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Kunne skaffe en markør"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Kunne ikke læse mappen %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Kunne ikke finde %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "F: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "A: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "F: Fejlene vedrører filen "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Kunne ikke omsætte navnet %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Trævandring mislykkedes"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Kunne ikke åbne %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Kunne ikke »readlink« %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Kunne ikke frigøre %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Kunne ikke lænke %s til %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Nåede DeLink-begrænsningen på %sB.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Arkivet havde intet package-felt"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s har ingen tvangs-post\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  pakkeansvarlig for %s er %s, ikke %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr ""
+"  %s har ingen linje med tilsidesættelse af standard for binøre filer\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Kunne ikke allokere hukommelse"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Kunne ikke åbne %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Ugyldig gennemtvangs %s-linje %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Kunne ikke læse gennemtvangsfilen %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Ugyldig gennemtvangs %s-linje %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Ugyldig gennemtvangs %s-linje %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Ugyldig gennemtvangs %s-linje %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Ukendt komprimeringsalgoritme »%s«"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimerede uddata %s kræver et komprimeringssæt"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Kunne ikke oprette FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Kunne ikke spalte"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Komprimer barn"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Intern fejl. Kunne ikke oprette %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IO til underproces/fil mislykkedes"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Kunne ikke læse under beregning af MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem under aflænkning af %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Brug: apt-internal-solver\n"
+"\n"
+"apt-internal-solver er en grænseflade, der skal bruge den aktuelle\n"
+"interne som en ekstern problemløser for APT-familien for fejlsøgning\n"
+"eller lignende\n"
+"\n"
+"Tilvalg:\n"
+" -h   Denne hjælpetekst.\n"
+" -q   Logbare uddata - ingen statusindikator\n"
+" -c=? Læs denne konfigurationsfil\n"
+" -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Ukendt pakkeindgang!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Brug: apt-sortpkgs [tilvalg] fil1 [fil2 ...]\n"
+"\n"
+"apt-sortpkgs er et simpelt værktøj til at sortere pakkefiler. Tilvalget -s\n"
+"bruges til at angive filens type.\n"
+"\n"
+"Tilvalg:\n"
+"  -h   Denne hjælpetekst\n"
+"  -s   Benyt kildefils-sortering\n"
+"  -c=? Læs denne opsætningsfil\n"
+"  -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s er ikke en gyldig DEB-pakke."
 
diff --git a/po/de.po b/po/de.po
index b097e830e..73f16608b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2012-06-27 10:55+0200\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -20,156 +20,157 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;>\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s Version %s hat eine unerfüllte Abhängigkeit:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Gesamtzahl an Paketnamen: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Gesamtzahl an Paketstrukturen: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  davon gewöhnliche Pakete: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  davon rein virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  davon einzelne virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  davon gemischte virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  davon fehlend: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Gesamtzahl an unterschiedlichen Versionen: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Gesamtzahl an unterschiedlichen Beschreibungen: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Gesamtzahl an Abhängigkeiten: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Gesamtzahl an Version/Datei-Beziehungen: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Gesamtzahl an Beschreibung/Datei-Beziehungen: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Gesamtzahl an Bereitstellungen: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Gesamtzahl an Mustern: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Gesamtmenge des Abhängigkeits-/Versionsspeichers: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Gesamtmenge an Slack: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Gesamtmenge an Speicher: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Paketdatei %s ist nicht synchronisiert."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Keine Pakete gefunden"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Sie müssen mindestens ein Suchmuster angeben"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark "
 "showauto«."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Paket %s kann nicht gefunden werden."
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Paketdateien:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Zwischenspeicher ist nicht synchron, Querverweisen einer Paketdatei nicht "
 "möglich"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Mit Pinning verwaltete Pakete:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(nicht gefunden)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Installiert: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Installationskandidat: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(keine)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Paket-Pinning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Versionstabelle:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -240,32 +241,32 @@ msgstr ""
 "Weitere Informationen finden Sie in den Handbuchseiten von apt-cache(8)\n"
 "und apt.conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Bitte geben Sie einen Namen für dieses Medium an, wie zum Beispiel »Debian "
 "5.0.3 Disk 1«"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 "Bitte legen Sie ein Medium in das Laufwerk ein und drücken Sie die "
 "Eingabetaste (Enter)."
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "»%s« konnte nicht in »%s« eingebunden werden."
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 "Wiederholen Sie dieses Prozedere für die restlichen Disks Ihres Satzes."
@@ -303,47 +304,47 @@ msgstr ""
 "  -c=?  Diese Konfigurationsdatei lesen\n"
 "  -o=?  Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Als Quellpaket wird »%s« statt »%s« gewählt.\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Nicht verfügbare Version »%s« von Paket »%s« wird ignoriert."
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Paket %s konnte nicht gefunden werden"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s wurde als manuell installiert festgelegt.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s wurde als automatisch installiert festgelegt.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -351,21 +352,21 @@ msgstr ""
 "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark auto« "
 "und »apt-mark manual«."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt."
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Quellpaket für %s kann nicht gefunden werden."
@@ -392,80 +393,80 @@ msgstr ""
 "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n"
 "für das Paket abzurufen.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Freier Platz in %s konnte nicht bestimmt werden."
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Sie haben nicht genügend freien Speicherplatz in %s."
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, 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:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Quelle %s wird heruntergeladen.\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Einige Archive konnten nicht heruntergeladen werden."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Entpackbefehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Kindprozess fehlgeschlagen"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten "
 "überprüft werden sollen."
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -474,18 +475,18 @@ msgstr ""
 "Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung "
 "finden Sie unter apt.conf(5) APT::Architectures."
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden."
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s hat keine Bauabhängigkeiten.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -494,7 +495,7 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen "
 "nicht erlaubt ist."
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -503,14 +504,14 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
 "gefunden werden kann."
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s "
 "ist zu neu."
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -520,7 +521,7 @@ msgstr ""
 "Installationskandidaten für das Paket %s die Versionsanforderungen nicht "
 "erfüllen kann."
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -529,30 +530,30 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein "
 "Installationskandidat existiert."
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Änderungsprotokoll (Changelog) für %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Unterstützte Module:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -647,54 +648,77 @@ msgstr ""
 "bezüglich weitergehender Informationen und Optionen.\n"
 "                                    Dieses APT hat Super-Kuh-Kräfte.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
+"sollen."
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr ""
 "Markierung für %s kann nicht gesetzt werden, da es nicht installiert ist.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s wurde bereits auf manuell installiert gesetzt.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s wurde bereits auf automatisch installiert gesetzt.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s wurde bereits auf Halten gesetzt.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s auf Halten gesetzt.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Halten-Markierung für %s entfernt.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Ausführen von dpkg fehlgeschlagen. Sind Sie root?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -742,7 +766,7 @@ msgstr ""
 "Siehe auch die Handbuchseiten apt-mark(8) und apt.conf(5) bezüglich\n"
 "weitergehender Informationen und Optionen."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -792,53 +816,53 @@ msgstr ""
 msgid "Disk not found."
 msgstr "Medium nicht gefunden"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
 # looks like someone hardcoded English grammar
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Abfrage mit »stat« fehlgeschlagen"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Änderungszeitpunkt kann nicht gesetzt werden."
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ungültige URI, lokale URIs dürfen nicht mit // beginnen."
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Anmeldung läuft"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Name des Kommunikationspartners kann nicht bestimmt werden."
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Lokaler Name kann nicht bestimmt werden."
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Verbindung durch Server abgelehnt; Server meldet: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Befehl USER fehlgeschlagen, Server meldet: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Befehl PASS fehlgeschlagen, Server meldet: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -846,123 +870,125 @@ msgstr ""
 "Es war ein Proxy-Server angegeben, aber kein Login-Skript, Acquire::ftp::"
 "ProxyLogin ist leer."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen, Server meldet: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Befehl TYPE fehlgeschlagen: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Zeitüberschreitung der Verbindung"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Verbindung durch Server geschlossen"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Lesefehler"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Protokoll beschädigt"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Schreibfehler"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Socket konnte nicht erzeugt werden."
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden."
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Passiver Socket konnte nicht verbunden werden."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 "Von der Funktion getaddrinfo wurde kein auf Verbindungen wartender Socket "
 "gefunden."
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Verbindung des Sockets nicht möglich"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Warten auf Verbindungen auf dem Socket nicht möglich"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Name des Sockets konnte nicht bestimmt werden."
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "PORT-Befehl konnte nicht gesendet werden."
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Unbekannte Adressfamilie %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Befehl EPRT fehlgeschlagen: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Zeitüberschreitung bei Datenverbindungsaufbau"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Verbindung konnte nicht angenommen werden."
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problem bei Bestimmung des Hashwertes einer Datei"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Datei konnte nicht heruntergeladen werden; Server meldet: »%s«"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Zeitüberschreitung bei Datenverbindung"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Datenübertragung fehlgeschlagen; Server meldet: »%s«"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Abfrage"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Aufruf nicht möglich: "
 
@@ -1000,7 +1026,7 @@ msgstr "Verbindung mit %s:%s nicht möglich (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Verbindung mit %s"
@@ -1030,40 +1056,40 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
 msgid "Unable to connect to %s:%s:"
 msgstr "Verbindung mit %s:%s nicht möglich:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte "
 "jedoch nicht ermittelt werden?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "»gpgv« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist gpgv "
 "installiert?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Unbekannter Fehler beim Ausführen von gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Die folgenden Signaturen waren ungültig:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1072,153 +1098,388 @@ msgstr ""
 "öffentlicher\n"
 "Schlüssel nicht verfügbar ist:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Leere Dateien können kein gültiges Archiv sein."
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Fehler beim Schreiben der Datei"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der "
 "anderen Seite geschlossen."
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben in Datei"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Auswahl fehlgeschlagen"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Zeitüberschreitung bei Verbindung"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben der Ausgabedatei"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Warten auf Kopfzeilen"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Ungültige Kopfzeile"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Vom HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt."
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 "Vom HTTP-Server wurde eine ungültige »Content-Length«-Kopfzeile gesandt."
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 "Vom HTTP-Server wurde eine ungültige »Content-Range«-Kopfzeile gesandt."
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr ""
 "Teilweise Dateiübertragung wird vom HTTP-Server nur fehlerhaft unterstützt."
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Unbekanntes Datumsformat"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt."
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Fertig"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Abhängigkeiten werden korrigiert ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " fehlgeschlagen."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Abhängigkeiten konnten nicht korrigiert werden."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fertig"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installiert]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installiert]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installiert]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installiert]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "aber %s ist installiert"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "aber %s soll installiert werden"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "ist aber nicht installierbar"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "ist aber ein virtuelles Paket"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "ist aber nicht installiert"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "soll aber nicht installiert werden"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " oder"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Die folgenden NEUEN Pakete werden installiert:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Die folgenden Pakete werden ENTFERNT:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Die folgenden Pakete sind zurückgehalten worden:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (wegen %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
+"Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualisiert, %lu neu installiert, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu erneut installiert, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu durch eine ältere Version ersetzt, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nicht vollständig installiert oder entfernt.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Der Befehl »update« akzeptiert keine Argumente."
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interner Fehler, Anordnung beendete nicht"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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 "
 "eine E-Mail an apt@packages.debian.org (auf Englisch bitte)."
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Es müssen noch %sB von %sB an Archiven heruntergeladen werden.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Es müssen %sB an Archiven heruntergeladen werden.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Sie haben nicht genug Platz in %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet."
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Ja, tue was ich sage!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1229,19 +1490,19 @@ msgstr ""
 "Zum Fortfahren geben Sie bitte »%s« ein.\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Abbruch."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortfahren?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Einige Dateien konnten nicht heruntergeladen werden."
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1249,19 +1510,19 @@ msgstr ""
 "Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get "
 "update« ausführen oder mit »--fix-missing« probieren?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt."
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Fehlende Pakete konnten nicht korrigiert werden."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Installation abgebrochen."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1275,16 +1536,16 @@ msgstr[1] ""
 "Die folgenden Pakete verschwanden von Ihrem System, da alle\n"
 "Dateien von anderen Paketen überschrieben wurden:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden."
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1303,16 +1564,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interner Fehler, AutoRemover hat etwas beschädigt."
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1325,7 +1586,7 @@ msgstr[1] ""
 "Die folgenden Pakete wurden automatisch installiert und werden nicht mehr "
 "benötigt:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1335,17 +1596,17 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Verwenden Sie »apt-get autoremove«, um es zu entfernen."
 msgstr[1] "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1353,7 +1614,7 @@ msgstr ""
 "Unerfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe "
 "eines Pakets (oder geben Sie eine Lösung an)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1365,324 +1626,97 @@ msgstr ""
 "Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n"
 "nicht erstellt wurden oder Incoming noch nicht verlassen haben."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Beschädigte Pakete"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Vorgeschlagene Pakete:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Empfohlene Pakete:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 reellen aktuellen\n"
+"         Status der Sperre nicht darauf!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Authentifizierungswarnung überstimmt.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Einige Pakete konnten nicht authentifiziert werden."
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Diese Pakete ohne Überprüfung installieren?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Fehlschlag beim Holen von %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installiert]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installiert]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installiert]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installiert]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "aber %s ist installiert"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "aber %s soll installiert werden"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "ist aber nicht installierbar"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "ist aber ein virtuelles Paket"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "ist aber nicht installiert"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "soll aber nicht installiert werden"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " oder"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Die folgenden NEUEN Pakete werden installiert:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Die folgenden Pakete werden ENTFERNT:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Die folgenden Pakete sind zurückgehalten worden:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (wegen %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
-"Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualisiert, %lu neu installiert, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu erneut installiert, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu durch eine ältere Version ersetzt, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nicht vollständig installiert oder entfernt.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Abhängigkeiten werden korrigiert ..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " fehlgeschlagen."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Abhängigkeiten konnten nicht korrigiert werden."
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Fertig"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Der Befehl »update« akzeptiert keine Argumente."
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt."
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Fertig"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 reellen aktuellen\n"
-"         Status der Sperre nicht darauf!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "%s konnte nicht in %s umbenannt werden."
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "OK   "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Holen: "
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Fehl "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Es wurden %sB in %s geholt (%sB/s).\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Wird verarbeitet]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1695,19 +1729,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s kann nicht gelesen werden."
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Es konnte nicht nach %s gewechselt werden."
@@ -1736,12 +1770,12 @@ msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden."
 msgid "[Mirror: %s]"
 msgstr "[Spiegelserver: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden."
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Verbindung vorzeitig beendet"
 
@@ -1783,1363 +1817,461 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Verfügbare Informationen werden zusammengeführt."
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Aufruf: apt-extracttemplates datei1 [datei2 ...]\n"
-"\n"
-"apt-extracttemplates ist ein Werkzeug, um Informationen zu Konfiguration\n"
-"und Vorlagen (Templates) aus Debian-Paketen zu extrahieren.\n"
-"\n"
-"Optionen:\n"
-"  -h    Dieser Hilfetext\n"
-"  -t    Das temporäre Verzeichnis setzen\n"
-"  -c=?  Diese Konfigurationsdatei lesen\n"
-"  -o=?  Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Schreiben nach %s nicht möglich"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr ""
-"Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Paketerweiterungsliste ist zu lang."
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Fehler beim Verarbeiten von Verzeichnis %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Quellerweiterungsliste ist zu lang."
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Fehler beim Verarbeiten der Inhalte %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Aufruf:  apt-ftparchive [optionen] befehl\n"
-"Befehle: packages Binärpfad [Override-Datei [Pfadpräfix]]\n"
-"         sources Quellpfad [Override-Datei [Pfadpräfix]]\n"
-"         contents Pfad\n"
-"         release Pfad\n"
-"         generate Konfigurationsdatei [Gruppen]\n"
-"         clean Konfigurationsdatei\n"
-"\n"
-"apt-ftparchive erstellt Indexdateien für Debian-Archive. Es unterstützt "
-"viele\n"
-"verschiedene Arten der Erstellung, von vollautomatisch bis hin zu den\n"
-"funktionalen Äquivalenten von dpkg-scanpackages und dpkg-scansources.\n"
-"\n"
-"apt-ftparchive erstellt Package-Dateien aus einem Baum von .debs. Die "
-"Package-\n"
-"Datei enthält den Inhalt aller Steuerfelder aus jedem Paket sowie einen "
-"MD5-\n"
-"Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte "
-"für\n"
-"Priorität und Bereich (Section) zu erzwingen.\n"
-"\n"
-"Auf ganz ähnliche Weise erstellt apt-ftparchive Sources-Dateien aus einem "
-"Baum\n"
-"von .dscs. Die Option --source-override kann benutzt werden, um eine "
-"Override-\n"
-"Datei für Quellen anzugeben.\n"
-"\n"
-"Die Befehle »packages« und »source« sollten von der Wurzel des Baums aus\n"
-"aufgerufen werden. Binärpfad sollte auf die Basis der rekursiven Suche "
-"zeigen\n"
-"und Override-Datei sollte die Override-Flags enthalten. Pfadpräfix wird, so\n"
-"vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Optionen:\n"
-"  -h           dieser Hilfe-Text\n"
-"  --md5        MD5-Hashes erzeugen\n"
-"  -s=?         Override-Datei für Quellen\n"
-"  -q           ruhig\n"
-"  -d=?         optionale Zwischenspeicher-Datenbank auswählen\n"
-"  --no-delink  Debug-Modus für Delinking aktivieren\n"
-"  --contents   Inhaltsdatei erzeugen\n"
-"  -c=?         diese Konfigurationsdatei lesen\n"
-"  -o=?         eine beliebige Konfigurationsoption setzen"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Keine Auswahl traf zu"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«."
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern."
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Datenbankformat ist ungültig. Wenn Sie ein Upgrade (Paketaktualisierung) von "
-"einer älteren apt-Version gemacht haben, entfernen Sie bitte die Datenbank "
-"und erstellen Sie sie neu."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%s mit »stat« abfragen fehlgeschlagen"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Archiv hat keinen Steuerungsdatensatz."
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Unmöglich, einen Cursor zu bekommen"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: %s mit »stat« abfragen nicht möglich.\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "F: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "F: Fehler gehören zu Datei "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s konnte nicht aufgelöst werden."
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Öffnen von %s fehlgeschlagen"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink von %s fehlgeschlagen"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Entfernen (unlink) von %s fehlgeschlagen"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-Limit von %sB erreicht\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Archiv hatte kein Feld »package«"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s-Betreuer ist %s und nicht %s.\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s hat keinen Eintrag in der Source-Override-Liste.\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s hat keinen Eintrag in der Binary-Override-Liste.\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Speicheranforderung fehlgeschlagen"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s konnte nicht geöffnet werden."
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Missgestaltetes Override %s Zeile %llu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Override-Datei %s konnte nicht gelesen werden."
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Missgestaltetes Override %s Zeile %llu #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Missgestaltetes Override %s Zeile %llu #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Missgestaltetes Override %s Zeile %llu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Unbekannter Komprimierungsalgorithmus »%s«"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz."
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "FILE* konnte nicht erzeugt werden."
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Fork fehlgeschlagen"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Komprimierungs-Kindprozess"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Interner Fehler, %s konnte nicht erzeugt werden."
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "E/A zu Kindprozess/Datei fehlgeschlagen"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem beim Entfernen (unlink) von %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "%s konnte nicht in %s umbenannt werden."
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Aufruf: apt-internal-solver\n"
-"\n"
-"apt-internal-solver ist eine Schnittstelle, um den derzeitigen internen\n"
-"Problemlöser für die APT-Familie wie einen externen zu verwenden, zwecks\n"
-"Fehlersuche oder ähnlichem.\n"
-"\n"
-"Optionen:\n"
-"  -h   dieser Hilfetext\n"
-"  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
-"  -c=? Diese Konfigurationsdatei benutzen\n"
-"  -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Unbekannter Paketeintrag!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Aufruf: apt-sortpkgs [optionen] datei1 [datei2 ...]\n"
-"\n"
-"apt-sortpkgs ist ein einfaches Werkzeug, um Paketdateien zu sortieren. Die\n"
-"Option -s wird benutzt, um anzuzeigen, um was für eine Datei es sich "
-"handelt.\n"
-"\n"
-"Optionen:\n"
-"  -h   Dieser Hilfetext\n"
-"  -s   Quelldateisortierung benutzen\n"
-"  -c=? Diese Konfigurationsdatei lesen\n"
-"  -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden."
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "gzip konnte nicht ausgeführt werden."
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Beschädigtes Archiv"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Ungültige Archiv-Signatur"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Fehler beim Lesen der Archivdatei-Kopfzeilen"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ungültige Archivbestandteil-Kopfzeile %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Ungültige Archivdatei-Kopfzeilen"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Archiv ist zu kurz."
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden."
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "»DropNode« auf noch verknüpften Knoten aufgerufen"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Hash-Element konnte nicht gefunden werden!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Umleitung konnte nicht reserviert werden."
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Interner Fehler in »AddDiversion«"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Es wird versucht, eine Umleitung zu überschreiben: %s -> %s und %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Doppelte Hinzufügung der Umleitung %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Doppelte Konfigurationsdatei %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Datei %s konnte nicht geschrieben werden."
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Datei %s konnte nicht geschlossen werden."
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Der Pfad %s ist zu lang."
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s mehr als einmal entpackt"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Das Verzeichnis %s ist umgeleitet."
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Der Umleitungspfad ist zu lang."
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s mit »stat« abfragen fehlgeschlagen"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s konnte nicht in %s umbenannt werden."
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt."
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Knoten konnte nicht in seinem Hash gefunden werden."
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Der Pfad ist zu lang."
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Pakettreffer ohne Version für %s wird überschrieben."
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben."
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s mit »stat« abfragen nicht möglich"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Datei %s konnte nicht geschrieben werden."
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Datei %s konnte nicht geschlossen werden."
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält."
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Auswerten der »control«-Datei nicht möglich"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden."
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Datei-Deskriptor %i konnte nicht dupliziert werden."
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "mmap mit %llu Byte Größe konnte nicht erzeugt werden."
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "mmap konnte nicht geschlossen werden."
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "mmap konnte nicht synchronisiert werden."
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "mmap mit %lu Byte Größe konnte nicht erzeugt werden."
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Datei konnte nicht eingekürzt werden."
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"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-Start. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Unmöglich, die Größe der MMap zu erhöhen, da das Limit von %lu Byte bereits "
-"erreicht ist."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Unmöglich, die Größe der MMap zu erhöhen, da das automatische Anwachsen der "
-"MMap vom Benutzer deaktiviert ist."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li h %li min %li s"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%li min %li s"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%li s"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Auswahl %s nicht gefunden"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Nicht erkannte Typabkürzung: »%c«"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ungültige Archiv-Signatur"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Konfigurationsdatei %s wird geöffnet"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Fehler beim Lesen der Archivdatei-Kopfzeilen"
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Syntaxfehler %s:%u: Block beginnt ohne Namen."
+msgid "Invalid archive member header %s"
+msgstr "Ungültige Archivbestandteil-Kopfzeile %s"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaxfehler %s:%u: Missgestaltete Markierung"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ungültige Archivdatei-Kopfzeilen"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn nach Wert"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Archiv ist zu kurz."
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden."
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (includes)"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden."
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaxfehler %s:%u: Eingefügt von hier"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "gzip konnte nicht ausgeführt werden."
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Beschädigtes Archiv"
 
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Syntaxfehler %s:%u: Löschdirektiven benötigen einen Optionsbaum als Argument"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn am Dateiende"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Fehler!"
+msgid "Unable to stat %s."
+msgstr "%s mit stat abfragen nicht möglich"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Fertig"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Fertig"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Befehlszeilenoption »%c« [aus %s] ist nicht bekannt."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Befehlszeilenoption %s konnte nicht ausgewertet werden."
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Befehlszeilenoption %s ist nicht Bool'sch."
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Option %s erfordert ein Argument."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<Wert>«."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«."
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Option »%s« ist zu lang."
-
-# Check for boolean; -1 is unspecified, 0 is yes 1 is no
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Der Sinn von »%s« ist nicht klar, versuchen Sie »true« oder »false«."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Ungültige Operation %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Einbindungspunkt %s mit »stat« abfragen nicht möglich."
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "CD-ROM mit »stat« abfragen fehlgeschlagen"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problem beim Schließen der gzip-Datei %s"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet."
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Sperrdatei %s konnte nicht geöffnet werden."
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Ausführen von dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet."
+msgid "Packaging system '%s' is not supported"
+msgstr "Paketierungssystem »%s« wird nicht unterstützt."
 
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Konnte Sperre %s nicht bekommen"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Dateiliste kann nicht erstellt werden, da »%s« kein Verzeichnis ist."
+msgid "Wrote %i records.\n"
+msgstr "Es wurden %i Datensätze geschrieben.\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-"»%s« in Verzeichnis »%s« wird ignoriert, da es keine reguläre Datei ist."
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-"Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie keine Dateinamen-"
-"Erweiterung hat."
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie eine ungültige "
-"Dateinamen-Erweiterung hat."
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen."
+"Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien "
+"geschrieben.\n"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Unterprozess %s hat das Signal %u empfangen."
+msgid "Can't find authentication record for: %s"
+msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s"
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)"
+msgid "Hash mismatch for: %s"
+msgstr "Hash-Summe stimmt nicht überein für: %s"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Unterprozess %s unerwartet beendet"
+msgid "The method driver %s could not be found."
+msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
 
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Datei %s konnte nicht geöffnet werden."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden."
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr ""
-"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden."
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Fehler beim Ausführen von Komprimierer "
+msgid "Method %s did not start correctly"
+msgstr "Methode %s ist nicht korrekt gestartet."
 
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "read, still have %llu to read but none left"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Lesevorgang: es verbleiben noch %llu zu lesen, jedoch ist nichts mehr übrig."
+"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und "
+"drücken Sie die Eingabetaste (Enter)."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch "
-"nicht möglich."
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "Problem beim Schließen der Datei %s"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problem beim Umbenennen der Datei %s nach %s"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problem beim Entfernen (unlink) der Datei %s"
+"Die Paketliste oder die Statusdatei konnte nicht eingelesen oder geöffnet "
+"werden."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problem beim Synchronisieren der Datei"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren."
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Kein Schlüsselring in %s installiert"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Die Liste der Quellen konnte nicht gelesen werden."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Leerer Paketzwischenspeicher"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Die Paketzwischenspeicher-Datei ist beschädigt."
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr ""
 "Die Paketzwischenspeicher-Datei liegt in einer inkompatiblen Version vor."
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Die Paketzwischenspeicher-Datei ist beschädigt, sie ist zu klein."
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Das Versionssystem »%s« wird durch dieses APT nicht unterstützt."
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Der Paketzwischenspeicher wurde für eine andere Architektur aufgebaut."
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Hängt ab von"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Hängt ab von (vorher)"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Schlägt vor"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Empfiehlt"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Kollidiert mit"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Ersetzt"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Löst ab"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Beschädigt"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Wertet auf"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "wichtig"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "erforderlich"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Abhängigkeitsbaum wird aufgebaut."
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Installationskandidat-Versionen"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Abhängigkeitsgenerierung"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Statusinformationen werden eingelesen."
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "StateFile %s konnte nicht geöffnet werden."
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "%s wird geöffnet."
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Zeile %u in Quellliste %s zu lang."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt."
-"conf« unter APT::Immediate-Configure bezüglich weiterer Details. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "»%s« konnte nicht konfiguriert werden. "
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Dieser Installationslauf erfordert, dass vorübergehend das essentielle Paket "
-"%s aufgrund einer Konflikt-/Vor-Abhängigkeits-Schleife entfernt wird. Das "
-"ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte "
-"die Option APT::Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indexdateityp »%s« wird nicht unterstützt."
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür "
-"gefunden werden."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; "
-"dies könnte durch zurückgehaltene Pakete verursacht worden sein."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte "
-"Pakete."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Listenverzeichnis %spartial fehlt."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Archivverzeichnis %spartial fehlt."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Das Verzeichnis %s kann nicht gesperrt werden."
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Holen der Datei %li von %li (noch %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Holen der Datei %li von %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Methode %s ist nicht korrekt gestartet."
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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« ein und "
-"drücken Sie die Eingabetaste (Enter)."
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Paketierungssystem »%s« wird nicht unterstützt."
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s mit stat abfragen nicht möglich"
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei "
-"eintragen."
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Die Paketliste oder die Statusdatei konnte nicht eingelesen oder geöffnet "
-"werden."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Die Liste der Quellen konnte nicht gelesen werden."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"Der Wert »%s« ist für APT::Default-Release ungültig, da solch eine "
-"Veröffentlichung in den Paketquellen nicht verfügbar ist."
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-"Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeile(n)"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Pinning-Typ %s kann nicht interpretiert werden."
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Keine Priorität (oder Null) für Pin angegeben"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem."
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen diese "
 "APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen diese "
 "APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Na so was, Sie haben die Anzahl an Beschreibungen überschritten, mit denen "
 "diese APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen "
 "diese APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden."
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Paketlisten werden gelesen"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Schreiben nach %s nicht möglich"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Szenario an Problemlöser senden"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Anfrage an Problemlöser senden"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Vorbereiten, eine Lösung zu erhalten"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Externen Problemlöser ausführen"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Hash-Summe stimmt nicht überein"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Größe stimmt nicht überein"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Ungültige Operation %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3148,17 +2280,17 @@ msgstr ""
 "Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden "
 "(falscher Eintrag in sources.list oder missgebildete Datei)."
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden."
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3167,12 +2299,12 @@ msgstr ""
 "Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für "
 "dieses Depot werden nicht angewendet."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3183,12 +2315,12 @@ msgstr ""
 "GPG-Fehler: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-Fehler: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3198,85 +2330,152 @@ msgstr ""
 "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
 "Architektur)."
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« "
 "herunterzuladen."
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release-Datei %s kann nicht verarbeitet werden."
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Herstellerblock %s enthält keinen Fingerabdruck."
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Keine Bereiche (Sections) in Release-Datei %s"
+msgid "List directory %spartial is missing."
+msgstr "Listenverzeichnis %spartial fehlt."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Kein Hash-Eintrag in Release-Datei %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Archivverzeichnis %spartial fehlt."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ungültiger »Valid-Until«-Eintrag in Release-Datei %s"
+msgid "Unable to lock directory %s"
+msgstr "Das Verzeichnis %s kann nicht gesperrt werden."
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Holen der Datei %li von %li (noch %s)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Herstellerblock %s enthält keinen Fingerabdruck."
+msgid "Retrieving file %li of %li"
+msgstr "Holen der Datei %li von %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Einige Indexdateien konnten nicht heruntergeladen werden. Sie wurden "
+"ignoriert oder alte an ihrer Stelle benutzt."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei "
+"eintragen."
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"Der Wert »%s« ist für APT::Default-Release ungültig, da solch eine "
+"Veröffentlichung in den Paketquellen nicht verfügbar ist."
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
+"Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeile(n)"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Pinning-Typ %s kann nicht interpretiert werden."
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Keine Priorität (oder Null) für Pin angegeben"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt."
+"conf« unter APT::Immediate-Configure bezüglich weiterer Details. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "»%s« konnte nicht konfiguriert werden. "
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Dieser Installationslauf erfordert, dass vorübergehend das essentielle Paket "
+"%s aufgrund einer Konflikt-/Vor-Abhängigkeits-Schleife entfernt wird. Das "
+"ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte "
+"die Option APT::Force-LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Zeile %u in Quellliste %s zu lang."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Einbindung der CD-ROM wird gelöst ...\n"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Verwendeter CD-ROM-Einbindungspunkt: %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Lösen der CD-ROM-Einbindung\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Warten auf Medium ...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "CD-ROM wird eingebunden ...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Identifizieren ... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Gespeicherte Kennzeichnung: %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Einbindung der CD-ROM wird gelöst ...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Durchsuchen des Mediums nach Index-Dateien ...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3285,7 +2484,7 @@ msgstr ""
 "%zu Paketindizes, %zu Quellindizes, %zu Übersetzungsindizes und %zu "
 "Signaturen gefunden\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3293,16 +2492,16 @@ msgstr ""
 "Es konnten keine Paketdateien gefunden werden; möglicherweise ist dies keine "
 "Debian-Disk oder eine für die falsche Architektur?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Kennzeichnung »%s« gefunden\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3311,83 +2510,109 @@ msgstr ""
 "Dieses Medium heißt: \n"
 "»%s«\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Kopieren der Paketlisten ..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Schreiben der neuen Quellliste\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Quelllisteneinträge für dieses Medium sind:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Es wurden %i Datensätze geschrieben.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür "
+"gefunden werden."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, 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/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; "
+"dies könnte durch zurückgehaltene Pakete verursacht worden sein."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte "
+"Pakete."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Abhängigkeitsbaum wird aufgebaut."
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Installationskandidat-Versionen"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Abhängigkeitsgenerierung"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Statusinformationen werden eingelesen."
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n"
+msgid "Failed to open StateFile %s"
+msgstr "StateFile %s konnte nicht geöffnet werden."
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien "
-"geschrieben.\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash-Summe stimmt nicht überein für: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden."
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version »%s« für »%s« konnte nicht gefunden werden."
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Task »%s« konnte nicht gefunden werden."
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Es können keine Versionen von Paket »%s« ausgewählt werden, da es rein "
 "virtuell ist."
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3396,179 +2621,242 @@ msgstr ""
 "Es kann weder eine installierte Version noch ein Installationskandidat von "
 "Paket »%s« ausgewählt werden, da beide nicht existieren."
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Die neueste Version von Paket »%s« kann nicht ausgewählt werden, da es rein "
 "virtuell ist."
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Es kann kein Installationskandidat von Paket »%s« ausgewählt werden, da kein "
 "solcher existiert."
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Die installierte Version von Paket »%s« kann nicht ausgewählt werden, da es "
 "nicht installiert ist."
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Szenario an Problemlöser senden"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Release-Datei %s kann nicht verarbeitet werden."
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Anfrage an Problemlöser senden"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Keine Bereiche (Sections) in Release-Datei %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Vorbereiten, eine Lösung zu erhalten"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Kein Hash-Eintrag in Release-Datei %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ungültiger »Valid-Until«-Eintrag in Release-Datei %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Externen Problemlöser ausführen"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Ausführen von dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Einige Indexdateien konnten nicht heruntergeladen werden. Sie wurden "
-"ignoriert oder alte an ihrer Stelle benutzt."
+"Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s wird geöffnet."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "%s wird installiert."
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "%s wird konfiguriert."
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "%s wird entfernt."
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s wird vollständig entfernt."
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Verschwinden von %s festgestellt"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Aufruf des Nach-Installations-Triggers %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Verzeichnis »%s« fehlt"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Datei »%s« konnte nicht geöffnet werden."
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wird entpackt."
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Konfiguration von %s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s installiert"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Entfernen von %s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Vollständiges Entfernen von %s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s vollständig entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Schreiben nach %s nicht möglich"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits "
 "erreicht ist."
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3576,7 +2864,7 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf "
 "hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3584,7 +2872,7 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
 "wegen voller Festplatte hindeutet."
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3592,7 +2880,7 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
 "wegen erschöpftem Arbeitsspeicher hindeutet."
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3601,14 +2889,14 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
 "wegen voller Festplatte hindeutet."
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Ein-/"
 "Ausgabe-Fehler von Dpkg hindeutet."
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3617,7 +2905,7 @@ msgstr ""
 "Sperren des Administrationsverzeichnisses (%s) nicht möglich, wird es von "
 "einem anderen Prozess verwendet?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3625,7 +2913,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3633,10 +2921,757 @@ msgstr ""
 "Der dpkg-Prozess wurde unterbrochen; Sie müssen manuell »%s« ausführen, um "
 "das Problem zu beheben."
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Nicht gesperrt"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li min %li s"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li s"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Auswahl %s nicht gefunden"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet."
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Sperrdatei %s konnte nicht geöffnet werden."
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet."
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Konnte Sperre %s nicht bekommen"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "Dateiliste kann nicht erstellt werden, da »%s« kein Verzeichnis ist."
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+"»%s« in Verzeichnis »%s« wird ignoriert, da es keine reguläre Datei ist."
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+"Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie keine Dateinamen-"
+"Erweiterung hat."
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie eine ungültige "
+"Dateinamen-Erweiterung hat."
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Unterprozess %s hat das Signal %u empfangen."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Unterprozess %s unerwartet beendet"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problem beim Schließen der gzip-Datei %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Datei %s konnte nicht geöffnet werden."
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden."
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr ""
+"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden."
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Fehler beim Ausführen von Komprimierer "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr ""
+"Lesevorgang: es verbleiben noch %llu zu lesen, jedoch ist nichts mehr übrig."
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr ""
+"Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch "
+"nicht möglich."
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problem beim Schließen der Datei %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem beim Umbenennen der Datei %s nach %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problem beim Entfernen (unlink) der Datei %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problem beim Synchronisieren der Datei"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Fehler!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Fertig"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Fertig"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden."
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Datei-Deskriptor %i konnte nicht dupliziert werden."
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "mmap mit %llu Byte Größe konnte nicht erzeugt werden."
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "mmap konnte nicht geschlossen werden."
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "mmap konnte nicht synchronisiert werden."
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "mmap mit %lu Byte Größe konnte nicht erzeugt werden."
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Datei konnte nicht eingekürzt werden."
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"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-Start. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Unmöglich, die Größe der MMap zu erhöhen, da das Limit von %lu Byte bereits "
+"erreicht ist."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Unmöglich, die Größe der MMap zu erhöhen, da das automatische Anwachsen der "
+"MMap vom Benutzer deaktiviert ist."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Einbindungspunkt %s mit »stat« abfragen nicht möglich."
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "CD-ROM mit »stat« abfragen fehlgeschlagen"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Nicht erkannte Typabkürzung: »%c«"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Konfigurationsdatei %s wird geöffnet"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Syntaxfehler %s:%u: Block beginnt ohne Namen."
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaxfehler %s:%u: Missgestaltete Markierung"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn nach Wert"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, 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:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (includes)"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaxfehler %s:%u: Eingefügt von hier"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Syntaxfehler %s:%u: Löschdirektiven benötigen einen Optionsbaum als Argument"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn am Dateiende"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Kein Schlüsselring in %s installiert"
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Befehlszeilenoption »%c« [aus %s] ist nicht bekannt."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Befehlszeilenoption %s konnte nicht ausgewertet werden."
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Befehlszeilenoption %s ist nicht Bool'sch."
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Option %s erfordert ein Argument."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<Wert>«."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«."
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Option »%s« ist zu lang."
+
+# Check for boolean; -1 is unspecified, 0 is yes 1 is no
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Der Sinn von »%s« ist nicht klar, versuchen Sie »true« oder »false«."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Ungültige Operation %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Aufruf: apt-extracttemplates datei1 [datei2 ...]\n"
+"\n"
+"apt-extracttemplates ist ein Werkzeug, um Informationen zu Konfiguration\n"
+"und Vorlagen (Templates) aus Debian-Paketen zu extrahieren.\n"
+"\n"
+"Optionen:\n"
+"  -h    Dieser Hilfetext\n"
+"  -t    Das temporäre Verzeichnis setzen\n"
+"  -c=?  Diese Konfigurationsdatei lesen\n"
+"  -o=?  Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s mit »stat« abfragen nicht möglich"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr ""
+"Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Paketerweiterungsliste ist zu lang."
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Fehler beim Verarbeiten von Verzeichnis %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Quellerweiterungsliste ist zu lang."
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Fehler beim Verarbeiten der Inhalte %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Aufruf:  apt-ftparchive [optionen] befehl\n"
+"Befehle: packages Binärpfad [Override-Datei [Pfadpräfix]]\n"
+"         sources Quellpfad [Override-Datei [Pfadpräfix]]\n"
+"         contents Pfad\n"
+"         release Pfad\n"
+"         generate Konfigurationsdatei [Gruppen]\n"
+"         clean Konfigurationsdatei\n"
+"\n"
+"apt-ftparchive erstellt Indexdateien für Debian-Archive. Es unterstützt "
+"viele\n"
+"verschiedene Arten der Erstellung, von vollautomatisch bis hin zu den\n"
+"funktionalen Äquivalenten von dpkg-scanpackages und dpkg-scansources.\n"
+"\n"
+"apt-ftparchive erstellt Package-Dateien aus einem Baum von .debs. Die "
+"Package-\n"
+"Datei enthält den Inhalt aller Steuerfelder aus jedem Paket sowie einen "
+"MD5-\n"
+"Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte "
+"für\n"
+"Priorität und Bereich (Section) zu erzwingen.\n"
+"\n"
+"Auf ganz ähnliche Weise erstellt apt-ftparchive Sources-Dateien aus einem "
+"Baum\n"
+"von .dscs. Die Option --source-override kann benutzt werden, um eine "
+"Override-\n"
+"Datei für Quellen anzugeben.\n"
+"\n"
+"Die Befehle »packages« und »source« sollten von der Wurzel des Baums aus\n"
+"aufgerufen werden. Binärpfad sollte auf die Basis der rekursiven Suche "
+"zeigen\n"
+"und Override-Datei sollte die Override-Flags enthalten. Pfadpräfix wird, so\n"
+"vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Optionen:\n"
+"  -h           dieser Hilfe-Text\n"
+"  --md5        MD5-Hashes erzeugen\n"
+"  -s=?         Override-Datei für Quellen\n"
+"  -q           ruhig\n"
+"  -d=?         optionale Zwischenspeicher-Datenbank auswählen\n"
+"  --no-delink  Debug-Modus für Delinking aktivieren\n"
+"  --contents   Inhaltsdatei erzeugen\n"
+"  -c=?         diese Konfigurationsdatei lesen\n"
+"  -o=?         eine beliebige Konfigurationsoption setzen"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Keine Auswahl traf zu"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«."
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern."
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Datenbankformat ist ungültig. Wenn Sie ein Upgrade (Paketaktualisierung) von "
+"einer älteren apt-Version gemacht haben, entfernen Sie bitte die Datenbank "
+"und erstellen Sie sie neu."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Archiv hat keinen Steuerungsdatensatz."
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Unmöglich, einen Cursor zu bekommen"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: %s mit »stat« abfragen nicht möglich.\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "F: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "F: Fehler gehören zu Datei "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "%s konnte nicht aufgelöst werden."
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Öffnen von %s fehlgeschlagen"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "readlink von %s fehlgeschlagen"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Entfernen (unlink) von %s fehlgeschlagen"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink-Limit von %sB erreicht\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Archiv hatte kein Feld »package«"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s-Betreuer ist %s und nicht %s.\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s hat keinen Eintrag in der Source-Override-Liste.\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s hat keinen Eintrag in der Binary-Override-Liste.\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Speicheranforderung fehlgeschlagen"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s konnte nicht geöffnet werden."
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Missgestaltetes Override %s Zeile %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Override-Datei %s konnte nicht gelesen werden."
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Missgestaltetes Override %s Zeile %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Missgestaltetes Override %s Zeile %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Missgestaltetes Override %s Zeile %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Unbekannter Komprimierungsalgorithmus »%s«"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz."
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "FILE* konnte nicht erzeugt werden."
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Fork fehlgeschlagen"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Komprimierungs-Kindprozess"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Interner Fehler, %s konnte nicht erzeugt werden."
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "E/A zu Kindprozess/Datei fehlgeschlagen"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem beim Entfernen (unlink) von %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Aufruf: apt-internal-solver\n"
+"\n"
+"apt-internal-solver ist eine Schnittstelle, um den derzeitigen internen\n"
+"Problemlöser für die APT-Familie wie einen externen zu verwenden, zwecks\n"
+"Fehlersuche oder ähnlichem.\n"
+"\n"
+"Optionen:\n"
+"  -h   dieser Hilfetext\n"
+"  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
+"  -c=? Diese Konfigurationsdatei benutzen\n"
+"  -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Unbekannter Paketeintrag!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Aufruf: apt-sortpkgs [optionen] datei1 [datei2 ...]\n"
+"\n"
+"apt-sortpkgs ist ein einfaches Werkzeug, um Paketdateien zu sortieren. Die\n"
+"Option -s wird benutzt, um anzuzeigen, um was für eine Datei es sich "
+"handelt.\n"
+"\n"
+"Optionen:\n"
+"  -h   Dieser Hilfetext\n"
+"  -s   Quelldateisortierung benutzen\n"
+"  -c=? Diese Konfigurationsdatei lesen\n"
+"  -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s ist kein gültiges DEB-Paket."
 
diff --git a/po/dz.po b/po/dz.po
index 2880a849f..e7363d76a 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -19,157 +19,158 @@ msgstr ""
 "X-Poedit-Country: Bhutan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "ཐུམ་སྒྲིལ་ %s ཐོན་རིམ་ %s ལུ་ ཌེཔ་མ་ཚང་ཅིག་འདུག:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "སྤྱིར་བཏང་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་གཙང་མ་ཚུ:"
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་རྐྱང་པ་ཚུ:"
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་སླ་བསྲེ་ཡོད་མི་ཚུ:"
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "བརླག་སྟོར་ཞུགས་པ:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "རྟེན་འབྲེལ་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "ཡོངས་བསྡོམས་ཀྱིས་ས་ཁྲ་བཟོ་བ་ཚུ་བྱིནམ་ཨིན:"
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "སྤུངས་ཡོད་པའི་ཡིག་རྒྱུན་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "རྟེན་འབྲེལ་ཐོན་རིམ་བར་སྟོང་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:"
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།"
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "འདྲ་མཛོད་འདི་མཉམ་བྱུང་གི་ཕྱི་ཁར་ཨིན་པས་  ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་ལུ་ ཨེགསི་-རེཕ་འབད་མི་ཚུགས་པས།"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "ཁབ་གཟེར་བཏབ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(མ་ཐོབ།)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "མི་ངོ:"
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(ཅི་མེད།)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -244,29 +245,29 @@ msgstr ""
 "cache=/tmp\n"
 " ཧེང་བཀལ་བརྡ་དོན་གི་དོན་ལུ་ ཨེ་apt-cache(8)དང་apt.conf(5)ལག་ཐོག་ཤོག་ལེབ་ཚུ་བལྟ།.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "ཌིསིཀ་འདི་གི་དོན་ལུ་མིང་ཅིག་བླིན་གནང་  དཔེར་ན་ 'Debian 2.1r1 Disk 1'བཟུམ།"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "ཌིསིཀ་ཅིག་འདྲེན་འཕྲུལ་ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ཁྱོད་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌི་ལྷག་ལུས་ཡོད་མི་གི་དོན་ལུ་འ་ནི་ལས་སྦྱོར་དེ་ཡང་བསྐྱར་འབད།"
 
@@ -302,65 +303,65 @@ msgstr ""
 "  -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
 "  -o=? མཐུན་སྒྲིག་གི་རིམ་སྒྲིག་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་བཟུམ།\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
@@ -380,116 +381,116 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s་ནང་བར་སྟོང་"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB་ལེན་དགོཔ་འདུག་  འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, 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:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་  གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
 "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -498,37 +499,37 @@ msgstr ""
 "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
 "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s)་ལུ་མཐུད་དོ།"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -617,53 +618,74 @@ msgstr ""
 "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n"
 "                       འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -690,7 +712,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -739,52 +761,52 @@ msgstr ""
 msgid "Disk not found."
 msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "ཡུ་ཨར་ཨེལ་ ནུས་མེད་  ཉེ་གནས་ ཡུ་ཨར་ཨེལ་ཨེསི་འདི་གིས་//་དང་གཅིག་ཁར་འགོ་བཙུགས་ནི་མི་འོང་།"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "ནང་བསྐྱོད་འབད་དོ།"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "དོ་བཉམ་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "ཉེ་གནས་མིང་འདི་གཏན་འབེེབས་བཟོ་མ་ཚུགས།"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "སར་བར་འདི་གིས་ མཐུད་ལམ་འདི་ངོས་ལེན་འབད་མ་བཏུབ་པར་སླབ་མས: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "ལག་ལེན་པ་འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་གྱིས་སླབ་མས་: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "རྩི་སྤྲོད་འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་གྱིས་སླབ་མས་: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -792,121 +814,123 @@ msgstr ""
 "པོརོ་སི་སར་བར་ཅིག་གསལ་བཀོད་འབད་ཡོད་འདི་འབདཝ་ད་  ནང་བསྐྱོད་ཡིག་ཚུགས་མིན་འདུག་ Acquire::ftp::"
 "ProxyLoginའདི་སྟོངམ་ཨིན་པས།"
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "ནང་བསྐྱོད་ཡིག་ཚུགས་ བརྡ་བཀོད་'%s'་འདི་འཐོས་ཤོར་བྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས:%s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "ཡིག་དཔར་རྐྱབ་མ་བཏུབ་སར་བར་གྱིས་སླབ་མས། %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "མཐུད་ལམ་ངལ་མཚམས"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "འཛོལ་བ་ལྷབ།"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས་ ལུད་སོང་སྟེ་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "འཛོལ་བ་འབྲི།"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས་པར་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་  མཐུད་ལམ་ངལ་མཚམས།"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "བྱ་ཡུལ་གྱི་སོ་ཀེཊི་མཐུད་མ་ཚུགས།"
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo་འདི་གིས་ཉན་ནིའི་སོ་ཀེཊི་ཅིག་ལེན་མ་ཚུགས།"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "སོ་ཀེཊི་ཅིག་བསྡམས་མ་ཚུགས།"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "སོ་ཀེཊི་གུར་ཉེན་མ་ཚུགས།"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "སོ་ཀེཊི་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "འདྲེན་ལམ་གྱི་བརྡ་བཀོད་འདི་བཏང་མ་ཚུགས།"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "མ་ཤེས་པའི་ཁ་བྱང་གི་རིགས་ཚན་%u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "ཨི་པི་ཨར་ཊི་ འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་གིས་སླབ་མས:%s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ནི་ངལ་མཚམས་བྱུང་ནུག"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "ཡིག་སྣོད་ལེན་མ་ཚུགས་ སར་བར་'%s'གིས་སླབ་མས"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་ངལ་མཚམས།"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "གནད་སྡུད་གནས་སོར་དེ་འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་'%s'་གིས་སླབ་མས།"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "འདྲི་དཔྱད།"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།"
 
@@ -942,7 +966,7 @@ msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས།"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s་ལུ་མཐུད་དོ།"
@@ -972,190 +996,424 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་  འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
 "མ་ཚུགས?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 "འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འཐོབ་མི་ཚུགས་པས:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོ།"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "མགོ་ཡིག་གི་གྲལ་ཐིག་བྱང་ཉེས།"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-ཁྱབ་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ཁྱབ་ཚད་ཀྱི་རྒྱབ་སྐྱོར་དེ་ཆད་པ་བཟོ་བཏང་ནུག"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ།"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "ནང་འགོད་འཛོལ་བ་  ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "འབད་ཚར་ཡི།"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr "འབད་ཚར་ཡི།"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr "ཡང་ན།"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s( %s་གིས་སྦེ)"
+
+#: apt-private/private-output.cc:662
+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"
+"ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "ཝའི།"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "ནང་འཁོད་ཀྱི་འཛོལ་བ་  གཞི་བཙུགས་ཐུམ་སྒྲིལ་ཚུ་ ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་དང་གཅིག་ཁར་བོད་བརྡ་འབད་འདི་"
 "ཡོད!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན་ཐལ་ཏེ་འདུག"
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "ནང་འཁོད་འཛོལ་བ་  གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་  ཚད་འདི་གིས་ email apt@packages.debian.org་ལུ་མཐུན་སྒྲིག་མི་འབད་"
 "བས།"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%sBལེན་ནི་ལུ་དགོཔ་པས། ཡིག་མཛོད་ཚི་གི་%sB་\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "ཡིག་མཛོད་ཀྱི་%sB་འདི་ལེན་དགོ་པས།\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི་ཤུལ་ལས་ཌིཀསི་གི་བར་སྟོང་དེ་ལག་ལེན་འཐབ་འོང་།\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག"
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།"
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1166,20 +1424,20 @@ msgstr ""
 "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "བར་བཤོལ་འབད།"
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1187,19 +1445,19 @@ msgstr ""
 "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་  apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-"
 "missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1209,15 +1467,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1233,16 +1491,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1252,7 +1510,7 @@ msgid_plural ""
 msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1260,17 +1518,17 @@ msgid_plural ""
 msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1278,7 +1536,7 @@ msgstr ""
 "མ་ཚང་བའི་རྟེན་འབྲེལ་  ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
 "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1289,319 +1547,93 @@ msgstr ""
 "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
 "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།"
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 #, fuzzy
 msgid "Install these packages without verification?"
 msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr "ཡང་ན།"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s( %s་གིས་སྦེ)"
-
-#: apt-private/private-output.cc:631
-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"
-"ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "ཝའི།"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr "འབད་ཚར་ཡི།"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "ནང་འགོད་འཛོལ་བ་  ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "འབད་ཚར་ཡི།"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "ཨེབ།"
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "ལེན:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "ཨེལ་ཇི་ཨེན:"
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "ཨི་ཨར་ཨར།"
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s (%sB/s)་ནང་ལུ་%sB་དེ་ལེན་ཡོདཔ་ཨིན།\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [ལཱ་འབད་དོ།]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1614,19 +1646,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
@@ -1655,11 +1687,11 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ�
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།"
 
@@ -1703,1355 +1735,477 @@ msgstr ""
 msgid "Merging available information"
 msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n"
-"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n"
-"གདམ་ཁ་ཚུ།\n"
-"  -h   འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n"
-"  -t   འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
-"  -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
-"  -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་"
-"བཟུམ།\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr " %sལུ་འབྲི་མ་ཚུགས།"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "ཐུམ་སྒྲིལ་རྒྱ་བསྐྱེད་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"ལག་ལེན:apt-ftparchive [options] command\n"
-"བརྡ་བཀོད་ཚུ: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་འདི་གིས་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ཚུ་གི་དོན་ལུ་ ཚིག་ཡིག་གི་ཡིག་སྣོད་ཚུ་བཟོ་བཏོན་འབདཝ་"
-"ཨིན། dpkg-scanpackages དང་ dpkg-scansources་གི་དོན་ལུ་ལས་འགན་ཚབ་མ་ཚུ་ལུ་ཆ་ཚང་སྦེ་  "
-"རང་བཞིན་གྱི་སྦེ་བཟོ་བཟོཝ་་ནང་ལས་བཟོ་བཏོན་གྱི་བཟོ་རྣམ་ཚུ་ལྷམ་པ་མ་འདྲཝ་སྦེ་ཡོད་མི་ལུ་རྒྱབ་སྐྱོར་འབདཝ་"
-"ཨིན།\n"
-"\n"
-"apt-ftparchive་ འདི་གིས་.debs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད་ཚུ་བཟོ་བཏོན་འབདཝ་ཨིན། "
-"ཐུམ་སྒྲིལ་\n"
-" ཡིག་སྣོད་འདི་གི་ནང་ན་ ཐུམ་སྒྲིལ་རེ་རེ་བཞིན་ནང་གི་ཚད་འཛིན་ས་སྒོ་ཚུ་ཆ་མཉམ་གི་ནང་དོན་དང་ ཨེམ་ཌི་༥་དྲྭ་"
-"རྟགས། (#)་དང་ཡིག་སྣོད་ཀྱི་ཚད་ཚུ་ཡང་ཡོདཔ་ཨིན། ཟུར་བཞག་ཡིག་སྣོད་འདི་\n"
-"གཙོ་རིམ་དང་དབྱེ་ཚན་གྱི་གནས་གོང་དེ་བང་བཙོང་འབད་ནི་ལུ་རྒྱབ་སྐྱོར་འབད་ཡོདཔ་ཨིན།\n"
-"\n"
-"འདི་དང་ཆ་འདྲཝ་སྦེ་ apt-ftparchive་ འདི་གིས་.dscs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་འབྱུང་ཁུངས་ཡིག་སྣོད་ཚུ་"
-"བཟོ་བཏོན་འབདཝ་ཨིན།\n"
-" --source-ཟུར་བཞག་གི་གདམ་ཁ་འདི་ ཨེསི་ཨར་སི་ ཟུར་བཞག་ཡིག་སྣོད་ཅིག་གསལ་བཀོད་འབད་ནི་ལུ་ལག་ལེན་"
-"འཐབ་བཐུབ་ཨིན།\n"
-"\n"
-"'ཐུམ་སྒྲིལ་ཚུ་'་དང་'འབྱུང་ཁུངས་་' བརྡ་བཀོད་ཚུ་རྩ་འབྲེལ་འདི་གི་་རྩ་བ་ནང་ལུ་སྦེ་གཡོག་བཀོལ་དགོཔ་ཨིན། ཟུང་"
-"ལྡན་འགྲུལ་ལམ་འདི་གིས་ལོག་རིམ་འཚོལ་ཞིབ་འདི་གི་གཞི་རྟེན་ལུ་དཔག་དགོཔ་ཨིནམ་དང་\n"
-"ཟུར་བཞག་ཡིག་སྣོད་འདི་ལུ་ཟུར་བཞག་གི་ཟུར་རྟགས་འོང་དགོཔ་ཨིན། འགྲུལ་ལམ་སྔོན་ཚིག་འདི་\n"
-"ཡོད་པ་ཅིན་ཡིག་སྣོད་མིང་གི་ས་སྒོ་ཚུ་ལུ་འཇུག་སྣོན་འབད་དེ་ཡོདཔ་ཨིན། དཔེར་ན་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ལས་ལག་"
-"ལེན་བཟུམ:\n"
-"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"གདམ་ཁ་ཚུ:\n"
-"  -h    འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n"
-"  --md5 ཨེམ་ཌི་༥་ བཟོ་བཏོན་འདི་ཚད་འཛིན་འབདཝ་ཨིན།\n"
-"  -s=?  འབྱུང་ཁུངས་ཟུར་བཞག་གི་ཡིག་སྣོད།\n"
-"  -q    ཁུ་སིམ་སིམ།\n"
-"  -d=?  གདམ་ཁ་ཅན་གྱི་འདྲ་མཛོད་གནད་སྡུད་གཞི་རྟེན་འདི་སེལ་འཐུ་འབད།\n"
-"  --no-delink འབྲེལ་ལམ་མེད་སྦེ་བཟོ་་ནིའི་རྐྱེན་སེལ་ཐབས་ལམ་འདི་ལྕོགས་ཅན་བཟོ།\n"
-"  --contents  ནང་དོན་གི་ཡིག་སྣོད་བཟོ་བཏོན་འདི་ཚད་འཛིན་འབད།\n"
-"  -c=?  འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n"
-"  -o=?  མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་   %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསྐྱར་མིང་བཏགས་ཡི།"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་  %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།"
-
-#: ftparchive/cachedb.cc:76
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས།  ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་  ཡར་བསྐྱེད་འབད་ཡོད་"
-"པ་ཅིན་  རྩ་བསྐྲད་གཏང་ཞིནམ་ལས་  གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བསྐྲུན་འབད། "
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "ཨི:"
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "ཌབ་ལུ:"
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།"
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s ་རྒྱུན་སྐྱོང་པ་འདི་  %s ཨིན་   %s མེན།\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "ཡིག་སྣོད་*་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "ཁ་སྤེལ་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོད།"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n"
-"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n"
-"གདམ་ཁ་ཚུ།\n"
-"  -h   འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n"
-"  -t   འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
-"  -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
-"  -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་"
-"བཟུམ།\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "མ་ཤེས་པའི་ཐུམ་སྒྲིལ་གི་དྲན་ཐོ།"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"ལག་ལེན: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs་ འདི་ཐུམ་སྒྲིལ་གི་ཡིག་སྣོད་ཚུ་དབྱེ་སེལ་འབད་ནི་ལུ་  འཇམ་སམ་གྱི་ལག་ཆས་ཅིག་ཨིན། -s  "
-"གདམ་ཁ་འདི་ ཡིག་སྣོད་ཀྱི་དབྱེ་ཁག་ག་ཅི་བཟུམ་ཅིག་ཨིན་ན\n"
-"་བརྡ་སྟོན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་སྟེ་ཡོདཔ་ཨིན།\n"
-"\n"
-"གདམ་ཁ་ཚུ:\n"
-"  -h   འ་ནི་འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n"
-"  -s  འདི་གིས་འབྱུང་ཁུངས་ ཡིག་སྣོད་གསོག་འཇོག་འབད་དོན་ལུ་ལག་ལེན་འཐབ་ཨིན།\n"
-"  -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
-"  -o=? འདི་གིས་ མཐུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་ཁ་ཚུ་ཁཞི་སྒྲིག་འབདཝ་ཨིན་   དཔེར་ན་-o dir::cache=/"
-"tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་  ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "ནུས་མེད་ཡིག་མཛོད་ཀྱི་མིང་རྟགས།"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "ཡིག་མཛོད་འཐུས་མི་མགོ་ཡིག་ལྷག་ནིའི་འཛོལ་བ།"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མེད་ཐུང་ཀུ་འདུག"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "ཡིག་མཛོད་མགོ་ཡིག་ཚུ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "ད་ལྟོ་ཡང་འབྲེལ་ལམ་ཡོད་པའི་མཐུད་མཚམས་གུར་བཀོག་བཞག་མཐུད་མཚམས་དེ་བོད་བརྡ་འབད་འདི་ཡོད།"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "དྲྭ་རྟགས་རྒྱུ་རྫས་འདི་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "ཁ་ཕྱོགས་སྤྲོད་བཞག་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "ཁ་ཕྱོགས་ཁ་སྐོང་རྐྱབ་ནི་ནང་  ནང་འཁོད་ཀྱི་འཛོལ་བ།"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "%s -> %s ་དང་ %s/%s་ཁ་ཕྱོགས་ཅིག་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ་ཁ་སྐོང་།"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "%s་འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "སྦུང་ཚན་བཟོ་བཤོལ་%s་གཅིག་ལས་ལྷག་སྟེ་འདུག"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "ཐུམ་སྒྲིལ་འདི་གིས་ག་སྒྱུར་དམིགས་གཏད་%s/%s་ལུ་འབྲི་ནིའི་འབད་རྩོལ་བསྐྱེདཔ་དེ་ཡོད།"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "ཁ་སྒྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས།"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "སྣོད་ཡིག་%s་འདི་སྣོད་ཡིག་མེན་མི་ཅིག་གིས་ཚབ་བཙུག་དེ་ཡོདཔ་ཨིན།"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "ཁོང་རའི་དྲྭ་རྟགས། (#)རྡོབ་ནང་ལུ་མཐུད་མཚམས་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་ཅིག་ཨིན་པས།"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་བའི་ཐུམ་སྒྲིལ་དེ་གིས་འཐོན་རིམ་གཅིག་ད་ཡང་མཐུན་སྒྲིག་མི་འབད་བས།"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདཝ་ཨིན།"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་  '%s'འཐུས་མི་བརླག་སྟོར་ཞུགས་དོ།"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "ནང་འཁོད་འཛོལ་བ་གིས་འཐུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འཐོབ།"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "མིང་དཔྱད་འབད་མ་བཏུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད།"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "ནུས་མེད་ཡིག་མཛོད་ཀྱི་མིང་རྟགས།"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "ཡིག་མཛོད་འཐུས་མི་མགོ་ཡིག་ལྷག་ནིའི་འཛོལ་བ།"
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
+msgid "Invalid archive member header %s"
+msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མེད་ཐུང་ཀུ་འདུག"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "ཡིག་མཛོད་མགོ་ཡིག་ཚུ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་  ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%limin %lis"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:  སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན"
-
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས།"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མཁོ་མེད་ཐེབས།"
-
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།"
-
-#: apt-pkg/contrib/configuration.cc:868
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབདཝ་ལེ་ཤཱ་གྲངས་སུ་བཙུགསཔ་ཨིན།"
-
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་ཏེ་ཡོད།"
-
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ།"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... འཛོལ་བ་!"
-
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... འབད་ཚར་ཡོད།"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... འབད་ཚར་ཡོད།"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གྱི་གདམ་ཁ་'%c'[%s་ནང་ལས་]འདི་མ་ཤེས་པས།"
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "བ་རྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་ཧ་མ་གོ་བས།"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་བུ་ལིན་མེན་པས།"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "གདམ་ཁ་%s་ལུ་སྒྲུབ་རྟགས་ཅིག་དགོ་པས།"
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "གདམ་ཁ་%s:རིམ་སྒྲིག་གི་རྣམ་གྲངས་གསལ་བཀོད་ལུ་ =<val> ་ཅིག་དགོཔ་ཨིན།"
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "གདམ་ཁ་ %s ་ལུ་'%s'་མེན་པར་ ཧྲིལ་ཨང་སྒྲུབ་རྟགས་ཅིག་དགོས་མཁོ་ཡོདཔ་ཨིན"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "གདམ་ཁ་'%s'འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུགས་པས་  བདེན་པ་ཡང་ན་རྫུན་པ་ལུ་འབད་རྩོལ་བསྐྱེདཔ།"
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི་ངོ་བཤུས་འབད་མ་ཚུགས།"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།"
+msgid "Packaging system '%s' is not supported"
+msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།"
 
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།"
+msgid "Wrote %i records.\n"
+msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Could not get lock %s"
-msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
+"%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་ %iམཐུན་སྒྲིག་མེད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་"
+"ཡོདཔ་ཨིན།\n"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
+msgid "The method driver %s could not be found."
+msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།"
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།"
+msgid "Method %s did not start correctly"
+msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Could not open file %s"
-msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "ལྷག་  ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "འབྲི་  ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "ཐུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མཐུན་པའི་འཐོན་རིམ་ཅིག་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདཝ་ཨིནཔས།"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "རྟེནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "མི་མཐུནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "ཚབ་བཙུགསཔ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "གལ་ཅན།"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "དགོས་མཁོ་ཡོདཔ།"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "ཚད་ལྡན།"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "གདམ་ཁ་ཅན།"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "ཐེབས།"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "མི་ངོ་འཐོན་རིམཚུ།"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-#, fuzzy
-msgid "Reading state information"
-msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
-
-#: apt-pkg/depcache.cc:244
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "%s་ཁ་ཕྱེ་དོ།"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"མི་མཐུན་/སྔོན་རྟེན་འཕྲལ་བཀོལ་ལས་བརྟེན་ འ་ནི་གཞི་བཙུགས་གཡོག་བཀོལ་འདི་ལུ་ མེད་དུ་མི་རུང་བའི་%sཐུམ་"
-"སྒྲིལ་  གནས་སྐབས་ཀྱི་རྩ་བསྐྲད་གཏང་ནི་འདི་དགོས་མཁོ་ཡོདཔ་ཨིན། འདི་འཕྲལ་འཕྲལ་རང་བྱང་ཉེས་ཅིག་ཨིན་པས་ "
-"འདི་འབདཝ་ད་ཁྱོད་ཀྱི་ཐད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་ཁ་འདི་ཤུགས་"
-"ལྡན་བཟོ།"
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་"
-"མ་ཐོབ།"
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་"
-"སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།"
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "ཡིག་མཛོད་སྣོད་ཐོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཏེ་འདུག"
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ།)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།"
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་  ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %sལུ་འབྲི་མ་ཚུགས།"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "ཚད་མ་མཐུན།"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3059,12 +2213,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3073,106 +2227,168 @@ msgstr ""
 " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
 "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག  ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
+msgid "List directory %spartial is missing."
+msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
+msgid "Archives directory %spartial is missing."
+msgstr "ཡིག་མཛོད་སྣོད་ཐོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཏེ་འདུག"
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ།)"
+
+#: apt-pkg/acquire.cc:901
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
+"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་  འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་"
+"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་  ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
+msgid "Could not configure '%s'. "
+msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"མི་མཐུན་/སྔོན་རྟེན་འཕྲལ་བཀོལ་ལས་བརྟེན་ འ་ནི་གཞི་བཙུགས་གཡོག་བཀོལ་འདི་ལུ་ མེད་དུ་མི་རུང་བའི་%sཐུམ་"
+"སྒྲིལ་  གནས་སྐབས་ཀྱི་རྩ་བསྐྲད་གཏང་ནི་འདི་དགོས་མཁོ་ཡོདཔ་ཨིན། འདི་འཕྲལ་འཕྲལ་རང་བྱང་ཉེས་ཅིག་ཨིན་པས་ "
+"འདི་འབདཝ་ད་ཁྱོད་ཀྱི་ཐད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་ཁ་འདི་ཤུགས་"
+"ལྡན་བཟོ།"
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:571
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..."
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "སི་ཌི་-རོམ་བརྩེགས་བཤོལ་འབད་དོ།\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "ཌིསིཀ་གི་དོན་ལུ་བསྒུག་དོ...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "ངོས་འཛིན་འབད་དོ.."
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "ངོས་འཛིན་འབད་དོ..."
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..."
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "%i་ཐུམ་སྒྲིལ་གྱི་ཟུར་ཐོ་ཚུ་ཐོབ་ཅི་  %i་འབྱུང་ཁུངས་ཟུར་ཐོ་ཚུ་དང་ %iམིང་རྟགས་ཚུ།\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "དེ་ནུས་ཅན་གྱི་མིང་ཅིག་མེན་པས་ ལོག་སྟེ་རང་འབད་རྩོལ་བསྐྱེད།\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3181,304 +2397,1121 @@ msgstr ""
 "ཌིསིཀ་འདི་བོད་བརྡ་འབད་དོ་ཡོདཔ་ཨིན།\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "ཐུམ་སྒྲིལ་གྱིཐོ་ཡིག་ཚུ་འདྲ་བཤུས་རྐྱབ་དོ..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གསརཔ་ཅིག་འབྲི་དོ།\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་"
+"མ་ཐོབ།"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་"
+"སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་ %iམཐུན་སྒྲིག་མེད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་"
-"ཡོདཔ་ཨིན།\n"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "མི་ངོ་འཐོན་རིམཚུ།"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
+
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
+msgid "Failed to open StateFile %s"
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-pkg/tagfile.cc:140
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
+
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་  འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་"
-"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s་ཁ་ཕྱེ་དོ།"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "%s་རིམ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr " %sལུ་འབྲི་མ་ཚུགས།"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "ལྷག་  ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "འབྲི་  ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... འཛོལ་བ་!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... འབད་ཚར་ཡོད།"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... འབད་ཚར་ཡོད།"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
+
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི་ངོ་བཤུས་འབད་མ་ཚུགས།"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:  སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན"
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས།"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མཁོ་མེད་ཐེབས།"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབདཝ་ལེ་ཤཱ་གྲངས་སུ་བཙུགསཔ་ཨིན།"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་ཏེ་ཡོད།"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ།"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གྱི་གདམ་ཁ་'%c'[%s་ནང་ལས་]འདི་མ་ཤེས་པས།"
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "བ་རྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་ཧ་མ་གོ་བས།"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་བུ་ལིན་མེན་པས།"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "གདམ་ཁ་%s་ལུ་སྒྲུབ་རྟགས་ཅིག་དགོ་པས།"
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "གདམ་ཁ་%s:རིམ་སྒྲིག་གི་རྣམ་གྲངས་གསལ་བཀོད་ལུ་ =<val> ་ཅིག་དགོཔ་ཨིན།"
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "གདམ་ཁ་ %s ་ལུ་'%s'་མེན་པར་ ཧྲིལ་ཨང་སྒྲུབ་རྟགས་ཅིག་དགོས་མཁོ་ཡོདཔ་ཨིན"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "གདམ་ཁ་'%s'འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུགས་པས་  བདེན་པ་ཡང་ན་རྫུན་པ་ལུ་འབད་རྩོལ་བསྐྱེདཔ།"
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n"
+"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n"
+"གདམ་ཁ་ཚུ།\n"
+"  -h   འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n"
+"  -t   འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
+"  -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
+"  -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་"
+"བཟུམ།\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "ཐུམ་སྒྲིལ་རྒྱ་བསྐྱེད་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"ལག་ལེན:apt-ftparchive [options] command\n"
+"བརྡ་བཀོད་ཚུ: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་འདི་གིས་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ཚུ་གི་དོན་ལུ་ ཚིག་ཡིག་གི་ཡིག་སྣོད་ཚུ་བཟོ་བཏོན་འབདཝ་"
+"ཨིན། dpkg-scanpackages དང་ dpkg-scansources་གི་དོན་ལུ་ལས་འགན་ཚབ་མ་ཚུ་ལུ་ཆ་ཚང་སྦེ་  "
+"རང་བཞིན་གྱི་སྦེ་བཟོ་བཟོཝ་་ནང་ལས་བཟོ་བཏོན་གྱི་བཟོ་རྣམ་ཚུ་ལྷམ་པ་མ་འདྲཝ་སྦེ་ཡོད་མི་ལུ་རྒྱབ་སྐྱོར་འབདཝ་"
+"ཨིན།\n"
+"\n"
+"apt-ftparchive་ འདི་གིས་.debs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད་ཚུ་བཟོ་བཏོན་འབདཝ་ཨིན། "
+"ཐུམ་སྒྲིལ་\n"
+" ཡིག་སྣོད་འདི་གི་ནང་ན་ ཐུམ་སྒྲིལ་རེ་རེ་བཞིན་ནང་གི་ཚད་འཛིན་ས་སྒོ་ཚུ་ཆ་མཉམ་གི་ནང་དོན་དང་ ཨེམ་ཌི་༥་དྲྭ་"
+"རྟགས། (#)་དང་ཡིག་སྣོད་ཀྱི་ཚད་ཚུ་ཡང་ཡོདཔ་ཨིན། ཟུར་བཞག་ཡིག་སྣོད་འདི་\n"
+"གཙོ་རིམ་དང་དབྱེ་ཚན་གྱི་གནས་གོང་དེ་བང་བཙོང་འབད་ནི་ལུ་རྒྱབ་སྐྱོར་འབད་ཡོདཔ་ཨིན།\n"
+"\n"
+"འདི་དང་ཆ་འདྲཝ་སྦེ་ apt-ftparchive་ འདི་གིས་.dscs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་འབྱུང་ཁུངས་ཡིག་སྣོད་ཚུ་"
+"བཟོ་བཏོན་འབདཝ་ཨིན།\n"
+" --source-ཟུར་བཞག་གི་གདམ་ཁ་འདི་ ཨེསི་ཨར་སི་ ཟུར་བཞག་ཡིག་སྣོད་ཅིག་གསལ་བཀོད་འབད་ནི་ལུ་ལག་ལེན་"
+"འཐབ་བཐུབ་ཨིན།\n"
+"\n"
+"'ཐུམ་སྒྲིལ་ཚུ་'་དང་'འབྱུང་ཁུངས་་' བརྡ་བཀོད་ཚུ་རྩ་འབྲེལ་འདི་གི་་རྩ་བ་ནང་ལུ་སྦེ་གཡོག་བཀོལ་དགོཔ་ཨིན། ཟུང་"
+"ལྡན་འགྲུལ་ལམ་འདི་གིས་ལོག་རིམ་འཚོལ་ཞིབ་འདི་གི་གཞི་རྟེན་ལུ་དཔག་དགོཔ་ཨིནམ་དང་\n"
+"ཟུར་བཞག་ཡིག་སྣོད་འདི་ལུ་ཟུར་བཞག་གི་ཟུར་རྟགས་འོང་དགོཔ་ཨིན། འགྲུལ་ལམ་སྔོན་ཚིག་འདི་\n"
+"ཡོད་པ་ཅིན་ཡིག་སྣོད་མིང་གི་ས་སྒོ་ཚུ་ལུ་འཇུག་སྣོན་འབད་དེ་ཡོདཔ་ཨིན། དཔེར་ན་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ལས་ལག་"
+"ལེན་བཟུམ:\n"
+"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"གདམ་ཁ་ཚུ:\n"
+"  -h    འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n"
+"  --md5 ཨེམ་ཌི་༥་ བཟོ་བཏོན་འདི་ཚད་འཛིན་འབདཝ་ཨིན།\n"
+"  -s=?  འབྱུང་ཁུངས་ཟུར་བཞག་གི་ཡིག་སྣོད།\n"
+"  -q    ཁུ་སིམ་སིམ།\n"
+"  -d=?  གདམ་ཁ་ཅན་གྱི་འདྲ་མཛོད་གནད་སྡུད་གཞི་རྟེན་འདི་སེལ་འཐུ་འབད།\n"
+"  --no-delink འབྲེལ་ལམ་མེད་སྦེ་བཟོ་་ནིའི་རྐྱེན་སེལ་ཐབས་ལམ་འདི་ལྕོགས་ཅན་བཟོ།\n"
+"  --contents  ནང་དོན་གི་ཡིག་སྣོད་བཟོ་བཏོན་འདི་ཚད་འཛིན་འབད།\n"
+"  -c=?  འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n"
+"  -o=?  མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་   %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསྐྱར་མིང་བཏགས་ཡི།"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་  %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།"
+
+#: ftparchive/cachedb.cc:80
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས།  ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་  ཡར་བསྐྱེད་འབད་ཡོད་"
+"པ་ཅིན་  རྩ་བསྐྲད་གཏང་ཞིནམ་ལས་  གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བསྐྲུན་འབད། "
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "ཨི:"
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "ཌབ་ལུ:"
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།"
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s ་རྒྱུན་སྐྱོང་པ་འདི་  %s ཨིན་   %s མེན།\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "ཡིག་སྣོད་*་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "ཁ་སྤེལ་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོད།"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n"
+"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n"
+"གདམ་ཁ་ཚུ།\n"
+"  -h   འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n"
+"  -t   འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
+"  -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
+"  -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་"
+"བཟུམ།\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "མ་ཤེས་པའི་ཐུམ་སྒྲིལ་གི་དྲན་ཐོ།"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ལག་ལེན: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs་ འདི་ཐུམ་སྒྲིལ་གི་ཡིག་སྣོད་ཚུ་དབྱེ་སེལ་འབད་ནི་ལུ་  འཇམ་སམ་གྱི་ལག་ཆས་ཅིག་ཨིན། -s  "
+"གདམ་ཁ་འདི་ ཡིག་སྣོད་ཀྱི་དབྱེ་ཁག་ག་ཅི་བཟུམ་ཅིག་ཨིན་ན\n"
+"་བརྡ་སྟོན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་སྟེ་ཡོདཔ་ཨིན།\n"
+"\n"
+"གདམ་ཁ་ཚུ:\n"
+"  -h   འ་ནི་འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n"
+"  -s  འདི་གིས་འབྱུང་ཁུངས་ ཡིག་སྣོད་གསོག་འཇོག་འབད་དོན་ལུ་ལག་ལེན་འཐབ་ཨིན།\n"
+"  -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
+"  -o=? འདི་གིས་ མཐུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་ཁ་ཚུ་ཁཞི་སྒྲིག་འབདཝ་ཨིན་   དཔེར་ན་-o dir::cache=/"
+"tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s འདི་ནུས་ཅན་གྱི་ ཌི་ཨི་བི་ཅིག་མེན་པས།"
 
diff --git a/po/el.po b/po/el.po
index 923d455ca..0ca908252 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_el\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
 "Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -28,153 +28,154 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Το πακέτο %s με έκδοση %s έχει ανικανοποίητες εξαρτήσεις:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Συνολικά Ονόματα Πακέτων : "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Συνολο Δομών Πακέτου : "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Κανονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr " Πλήρως Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr " Μονά Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr " Μικτά Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "Αγνοούμενα: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Σύνολο Εξαρτήσεων: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Σύνολο Αντιστοιχίσεων Παροχών: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Σύνολο Κοινών Στοιχειοσειρών : "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Συνολικός χώρος Εξαρτήσεων Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Σύνολο χώρου ασφαλείας: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Συνολικός Καταμετρημένος Χώρος: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Δε βρέθηκαν πακέτα"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Πρέπει να δώσετε τουλάχιστον ένα μοτίβο αναζήτησης"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Αδυναμία εντοπισμού του πακέτου %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Αρχεία Πακέτου:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Καθηλωμένα Πακέτα:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(δε βρέθηκαν)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Εγκατεστημένα: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Υποψήφιο: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr " Καθήλωση Πακέτου: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Πίνακας Έκδοσης:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -249,29 +250,29 @@ msgstr ""
 "  -o=? Χρήση μιας αυθαίρετη επιλογής ρυθμίσεων, πχ -o dir::cache=/tmp\n"
 "Δείτε τις σελίδες man του apt-cache(8) και apt.conf(5) για πληροφορίες.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Παρακαλώ δώστε ένα όνομα για αυτόν τον δίσκο, όπως 'Debian 5.0.3 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Παρακαλώ εισάγετε το δίσκο στη συσκευή και πατήστε enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Αποτυχία σύνδεσης του %s σε %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Επαναλάβετε την διαδικασία για τα υπόλοιπα CD από το σετ σας."
 
@@ -308,69 +309,69 @@ msgstr ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Επιλογή του %s ώς λίστας πηγαίων πακέτων αντί της %s\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "το %s έχει εγκατασταθεί αυτόματα\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
 "υλικό"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
 "κωδικάτου"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
@@ -390,96 +391,96 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Μεταφόρτωση Κωδικα %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Η απογονική διεργασία απέτυχε"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -488,7 +489,7 @@ msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο "
 "πακέτο %s"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,14 +497,14 @@ msgid ""
 msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
 "είναι νεώτερο"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -512,7 +513,7 @@ msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
 "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις της έκδοσης"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,30 +522,30 @@ msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει "
 "υποψήφιαέκδοση"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog για %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Υποστηριζόμενοι Οδηγοί:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -629,53 +630,76 @@ msgstr ""
 "για περισσότερες πληροφορίες και επιλογές.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
+"κωδικάτου"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "αλλά δεν είναι εγκατεστημένο"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Αποτυχία ανοίγματος του %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -702,7 +726,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -750,52 +774,52 @@ msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μ�
 msgid "Disk not found."
 msgstr "Ο δίσκος δεν βρέθηκε."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Το αρχείο Δε Βρέθηκε"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Αποτυχία εύρεσης της κατάστασης"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Μη έγκυρο URI, τα τοπικά URI δεν πρέπει να αρχίζουν με //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Σύνδεση στο σύστημα"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Αδύνατος ο καθορισμός του ονόματος του ομότιμου (peer)"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Αδύνατος ο καθορισμός του τοπικού ονόματος"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Ο διακομιστής αρνήθηκε την σύνδεση με μήνυμα: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Η εντολή USER απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Η εντολή PASS απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -803,121 +827,123 @@ msgstr ""
 "Ο διαμεσολαβητής έχει οριστεί αλλά χωρίς σενάριο εισόδου, το Acquire::ftp::"
 "ProxyLogin είναι άδειο"
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Η εντολή '%s' στο σενάριο εισόδου απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Η εντολή TYPE απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Λήξη χρόνου σύνδεσης"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Ο διακομιστής έκλεισε την σύνδεση"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Σφάλμα ανάγνωσης"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Το μήνυμα απάντησης υπερχείλισε την ενδιάμεση μνήμη."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Αλλοίωση του πρωτοκόλλου"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Σφάλμα εγγραφής"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket)"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Αδύνατη η σύνδεση σε παθητική υποδοχή (socket)."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Το getaddrinfo ήταν αδύνατο να δέσμευση υποδοχή παρακολούθησης"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Αδύνατη η πρόσδεση στην υποδοχή (socket)"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Αδύνατη η παρακολούθηση της υποδοχής (socket)"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Αδύνατος ο καθορισμός του ονόματος της υποδοχής (socket)"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Αδύνατη η αποστολή της εντολής PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Άγνωστη οικογένεια διευθύνσεων %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Το EPRT απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδομένων"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Αδύνατη η αποδοχή συνδέσεων"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Πρόβλημα κατά το hashing του αρχείου"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Αδυναμία λήψης του αρχείου, ο διακομιστής απάντησε '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Λήξη χρόνου υποδοχής δεδομένων"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Αποτυχία κατά τη μεταφορά δεδομένων, ο διακομιστής απάντησε '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Επερώτηση"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Αδύνατη η εκτέλεση"
 
@@ -953,7 +979,7 @@ msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Σύνδεση στο %s"
@@ -983,18 +1009,18 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το
 msgid "Unable to connect to %s:%s:"
 msgstr "Αδύνατη η σύνδεση στο %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
 "αποτυπώματος?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
@@ -1002,22 +1028,22 @@ msgstr ""
 "εγκατεστημένο το gpgv;)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1025,119 +1051,355 @@ msgstr ""
 "Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν "
 "διαθέσιμο το δημόσιο κλειδί:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Η επιλογή απέτυχε"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Λήξη χρόνου σύνδεσης"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Αναμονή επικεφαλίδων"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Ελαττωματική γραμμή επικεφαλίδας"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Άγνωστη μορφή ημερομηνίας"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Υπολογισμός της αναβάθμισης... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Ετοιμο"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Διόρθωση εξαρτήσεων..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " απέτυχε."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Ετοιμο"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
+"προβλήματα."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "αλλά το %s είναι εγκατεστημένο"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "αλλά δεν είναι εγκαταστάσημο"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "αλλά είναι ένα εικονικό πακέτο"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "αλλά δεν είναι εγκατεστημένο"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " η"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (λόγω του %s) "
+
+#: apt-private/private-output.cc:662
+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"
+"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu επανεγκατεστημένα,"
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu υποβαθμισμένα, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[Ν/ο]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[ν/Ο]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "σφάλμα μεταγλωτισμου - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Η εντολή update δεν παίρνει ορίσματα"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages."
 "debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1145,31 +1407,31 @@ msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο  %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Υπάρχουν προβλήματα και δώσατε -y  χωρίς το --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία"
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Ναι, κανε ότι λέω!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1180,19 +1442,19 @@ msgstr ""
 "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Εγκατάλειψη."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Θέλετε να συνεχίσετε;"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1200,20 +1462,20 @@ msgstr ""
 "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update "
 "ή το --fix-missing;"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Αδύνατη η επίλυση των χαμένων πακέτων."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Εγκατάλειψη της εγκατάστασης."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1223,16 +1485,16 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1250,15 +1512,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1268,7 +1530,7 @@ msgstr[0] "Το ακόλουθο πακέτο εγκαταστάθηκε αυτ�
 msgstr[1] ""
 "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1278,17 +1540,17 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Χρησιμοποιήστε 'apt-get autoremove' για να το διαγράψετε."
 msgstr[1] "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1296,7 +1558,7 @@ msgstr ""
 "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
 "πακέτο (ή καθορίστε μια λύση)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1308,320 +1570,92 @@ msgstr ""
 "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
 "μετακινηθεί από τα εισερχόμενα."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Χαλασμένα πακέτα"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Προτεινόμενα πακέτα:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Συνιστώμενα πακέτα:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση;"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Αποτυχία ανάκτησης του %s   %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "αλλά το %s είναι εγκατεστημένο"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "αλλά δεν είναι εγκαταστάσημο"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "αλλά είναι ένα εικονικό πακέτο"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "αλλά δεν είναι εγκατεστημένο"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " η"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (λόγω του %s) "
-
-#: apt-private/private-output.cc:631
-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"
-"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu επανεγκατεστημένα,"
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu υποβαθμισμένα, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[Ν/ο]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[ν/Ο]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "σφάλμα μεταγλωτισμου - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Διόρθωση εξαρτήσεων..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " απέτυχε."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Ετοιμο"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
-"προβλήματα."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Η εντολή update δεν παίρνει ορίσματα"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Υπολογισμός της αναβάθμισης... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Ετοιμο"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Αποτυχία μετονομασίας του %s σε %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Hit "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Φέρε:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Αγνόησε "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Σφάλμα "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Μεταφορτώθηκαν %sB σε %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Επεξεργασία]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1634,19 +1668,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Αδύνατη η ανάγνωση του %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Αδύνατη η αλλαγή σε %s"
@@ -1675,11 +1709,11 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Η σύνδεση έκλεισε πρόωρα"
 
@@ -1723,1364 +1757,481 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n"
-"\n"
-"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n"
-"και πρότυπα από πακέτα debian\n"
-"\n"
-"Επιλογές:\n"
-"  -h   Το παρόν κείμενο βοήθειας\n"
-"  -t   Καθορισμός προσωρινού καταλόγου\n"
-"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
-"  -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Αδύνατη η εγγραφή στο %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Σφάλμα επεξεργασίας του καταλόγου %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Χρήση: apt-ftparchive [επιλογές] εντολή\n"
-"Εντολές: 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 παράγει αρχεία περιεχομένων για τις αρχειοθήκες Debian\n"
-"Υποστηρίζει πολλές παραλλαγές παραγωγής, από απόλυτα αυτοματοποιημένες έως\n"
-"λειτουργικές αντικαταστάσεις για την dpkg-scanpackages και dpkg-scansources\n"
-"\n"
-"Το apt-ftparchive παράγει αρχεία Package από ένα σύνολο αρχείων .debs. Στο\n"
-"αρχείο Package περιέχονται όλα τα πεδία ελέγχου κάθε πακέτου καθώς και\n"
-"το μέγεθος τους και το MD5 hash. Υποστηρίζει την ύπαρξη αρχείου παράκαμψης\n"
-"για τη βεβιασμένη αλλαγή των πεδίων Priority (Προτεραιότητα) και Section\n"
-"(Τομέας).\n"
-"\n"
-"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από μια\n"
-"ιεραρχία αρχείων .dsc. Η επιλογή --source-override μπορεί να χρησιμοποιηθεί\n"
-"για παράκαμψη των αρχείων πηγών src.\n"
-"\n"
-"Οι εντολές 'packages' και 'sources' θα πρέπει να εκτελούνται στον βασικό\n"
-"κατάλογο της ιεραρχίας.Το BinaryPath θα πρέπει να δείχνει στον αρχικό\n"
-"κατάλογο που θα ξεκινάει η αναδρομική αναζήτηση και το αρχείο παράκαμψης\n"
-"θα πρέπει να περιέχει τις επιλογές παράκαμψης. Το Pathprefix προστίθεται "
-"στα\n"
-"πεδία όνομάτων αρχείων, αν υπάρχει. Δείτε παράδειγμα χρήσης στην αρχειοθήκη\n"
-"πακέτων του Debian :\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Επιλογές:\n"
-"  -h    Αυτό το κείμενο βοηθείας\n"
-"  --md5 Έλεγχος παραγωγής MD5\n"
-"  -s=?  αρχείο παράκαμψης πηγών\n"
-"  -q    Χωρίς έξοδο\n"
-"  -d=?  Επιλογή προαιρετικής βάσης δεδομένων cache\n"
-"  --no-delink Αποσφαλμάτωση του delinking\n"
-"  --contents  Έλεγχος παραγωγής αρχείου περιεχομένων\n"
-"  -c=?  Χρήση αυτού του αρχείου ρυθμίσεων\n"
-"  -o=?  Ορισμός αυθαίρετης επιλογής ρύθμισης"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Δεν ταιριαξε καμία επιλογή"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s"
-
-#: ftparchive/cachedb.cc:76
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη "
-"έκδοση, παρακαλώ αφαιρέστε και δημιουργήστε τη βάση εκ νέου."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Αποτυχία εύρεσης της κατάστασης του %s."
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Αδύνατη η πρόσβαση σε δείκτη"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Αδύνατη η ανάγνωση του καταλόγου  %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Σφάλματα στο αρχείο"
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Αδύνατη η εύρεση του %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Αποτυχία ανεύρεσης"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Αποτυχία ανοίγματος του %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "Αποσύνδεση %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Αποτυχία ανάγνωσης του %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Αποτυχία αποσύνδεσης του %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "    Αποτυχία σύνδεσης του %s με το %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Αποσύνδεση ορίου του %sB hit.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s δεν περιέχει εγγραφή παράκαμψης\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s συντηρητής είναι ο %s όχι ο %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realoc - Αδυναμία εκχώρησης μνήμης"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Αδύνατο το άνοιγμα του %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Άγνωστος Αλγόριθμος Συμπίεσης '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Η συμπιεσμένη έξοδος του %s χρειάζεται καθορισμό συμπίεσης"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Αποτυχία δημιουργίας του ΑΡΧΕΙΟΥ"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Αποτυχία αγκίστρωσης"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Συμπίεση απογόνου"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Πρόβλημα κατά την αποσύνδεση του %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Αποτυχία μετονομασίας του %s σε %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n"
-"\n"
-"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n"
-"και πρότυπα από πακέτα debian\n"
-"\n"
-"Επιλογές:\n"
-"  -h   Το παρόν κείμενο βοήθειας\n"
-"  -t   Καθορισμός προσωρινού καταλόγου\n"
-"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
-"  -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Άγνωστη εγγραφή πακέτου!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Χρήση: apt-sortpkgs [παράμετροι] file1 [file2 ...]\n"
-"\n"
-"το apt-sortpkgs είναι ένα απλό εργαλείο για να ταξινομήσετε αρχεία πηγαίου "
-"κώδικα. Η επιλογή\n"
-"-s δείχνει τον τύπο του αρχείου.\n"
-"\n"
-"Παράμετροι:\n"
-"  -h   Αυτό το κείμενο βοήθειας\n"
-"  -s   Χρήση του τύπου αρχείου\n"
-"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
-"  -o=? Θέσε μια αυθαίρετη παράμετρο,πχ -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Αποτυχία κατά την εκτέλεση του gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Κατεστραμμένη αρχειοθήκη"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Μη έγκυρη υπογραφή αρχειοθήκης"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Σφάλμα κατά την ανάγνωση της επικεφαλίδας του μέλους της αρχειοθήκης"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Η αρχειοθήκη είναι πολύ μικρή"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Αποτυχία ανάγνωσης των επικεφαλίδων της αρχειοθήκης"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "Κλήση του DropNode σε έναν ήδη συνδεδεμένο κόμβο"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Αποτυχία εντοπισμού του στοιχείου hash!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Αδυναμία εντοπισμού εκτροπής"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Εσωτερικό Σφάλμα στο AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Προσπάθεια για αντικατάσταση εκτροπής, %s -> %s και %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Διπλή προσθήκη εκτροπής %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Διπλό αρχείο ρυθμίσεων %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Αποτυχία εγγραφής του αρχείου %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Αποτυχία στο κλείσιμο του αρχείου %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Η διαδρομή %s έχει υπερβολικό μήκος"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Αποσυμπίεση του %s πάνω από μια φορά"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Ο φάκελος %s έχει εκτραπεί"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Το πακέτο προσπαθεί να γράψει στον προορισμό εκτροπής %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Η διαδρομή εκτροπής έχει υπερβολικό μήκος"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Αποτυχία εύρεσης της κατάστασης του %s."
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Αποτυχία μετονομασίας του %s σε %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Ο φάκελος %s αντικαθίσταται από ένα μη-φάκελο"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Αποτυχία εντοπισμού του κόμβου στην ομάδα hash του"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Η διαδρομή έχει υπερβολικό μήκος"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδοση %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Αδύνατη η εύρεση της κατάστασης του %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Αποτυχία εγγραφής του αρχείου %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Αποτυχία στο κλείσιμο του αρχείου %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγνοείται το μέλος '%s'"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Μη αναλύσιμο αρχείο control"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Μη έγκυρη υπογραφή αρχειοθήκης"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Σφάλμα κατά την ανάγνωση της επικεφαλίδας του μέλους της αρχειοθήκης"
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
+msgid "Invalid archive member header %s"
+msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Αδύνατο το άνοιγμα του %s"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Αδύνατη η εκτέλεση"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Η αρχειοθήκη είναι πολύ μικρή"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Αποτυχία ανάγνωσης των επικεφαλίδων της αρχειοθήκης"
 
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Αποτυχία εγγραφής του αρχείου %s"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Αποτυχία κατά την εκτέλεση του gzip "
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Κατεστραμμένη αρχειοθήκη"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "Αδύνατη η εύρεση της κατάστασης του %s."
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%limin %lis"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Η επιλογή %s δε βρέθηκε"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα."
-
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή"
-
-#: apt-pkg/contrib/configuration.cc:861
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-"Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
+msgid "Packaging system '%s' is not supported"
+msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ"
+msgid "Wrote %i records.\n"
+msgstr "Εγιναν %i εγγραφές.\n"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Σφάλμα!"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Ολοκληρώθηκε"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Ολοκληρώθηκε"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Η επιλογή γραμμής εντολών '%c' [από %s] δεν είναι γνωστή."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Η επιλογή γραμμής εντολών %s δεν είναι κατανοητή"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Η επιλογή γραμμής εντολών %s δεν είναι boolean"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Η επιλογή %s απαιτεί ένα όρισμα."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-"Επιλογή %s: Οι προδιαγραφές του αντικειμένου ρυθμίσεων απαιτούν =<val>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Επιλογή %s: απαιτείται ένας ακέραιος αριθμός ως όρισμα, όχι '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Η επιλογή '%s' έχει υπερβολικό μήκος"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Η τιμή %s δεν είναι κατανοητή, δοκιμάστε σωστό (true) ή λάθος (false)."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Μη έγκυρη λειτουργία %s"
+msgid "Hash mismatch for: %s"
+msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom"
+msgid "The method driver %s could not be found."
+msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-"Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος "
-"%s"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Αδύνατο το κλείδωμα %s"
+msgid "Is the package %s installed?"
+msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgid "Method %s did not start correctly"
+msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
+"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
+"enter."
 
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
+"Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης."
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
+"Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
 
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Αποτυχία εκτέλεσης του συμπιεστή "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
-
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Εγκατάλειψη της εγκατάστασης."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Άδειο cache πακέτων"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Εξαρτάται από"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "ΠροΕξαρτάται από"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Προτείνει"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Συστήνει"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Ασύμβατο με"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Αντικαθιστά"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Απαρχαιώνει"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Χαλάει"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "σημαντικό"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "απαιτούμενο"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "καθιερωμένο"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "προαιρετικό"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "επιπλέον"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Υποψήφιες Εκδόσεις"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Παραγωγή Εξαρτήσεων"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Άνοιγμα του %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
-
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"Αυτή η προσπάθεια εγκατάστασης απαιτεί προσωρινή αφαίρεση του σημαντικού "
-"πακέτου %s λόγω ενός βρόγχου Ασυμβατότητας/ΠροΕξάρτησης. Αυτό συνήθως δεν "
-"είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την "
-"επιλογή APT::Force-LoopBreak option."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση "
-"κάποιας κατάλληλης αρχείοθήκης."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως "
-"προκλήθηκε από κρατούμενα πακέτα."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Ο φάκελος λιστών %spartial αγνοείται."
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται."
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Αδύνατο το κλείδωμα του καταλόγου"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Λήψη αρχείου %li του %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
-"enter."
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Αδύνατη η εύρεση της κατάστασης του %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης."
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr ""
-"Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Ανάγνωση Λιστών Πακέτων"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Συλλογή Παροχών Αρχείου"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Αδύνατη η εγγραφή στο %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Ανόμοιο μέγεθος"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Μη έγκυρη λειτουργία %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3088,12 +2239,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3102,12 +2253,12 @@ msgstr ""
 "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
 "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3115,71 +2266,133 @@ msgstr ""
 "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
 "πακέτο %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
+msgid "List directory %spartial is missing."
+msgstr "Ο φάκελος λιστών %spartial αγνοείται."
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
+msgid "Archives directory %spartial is missing."
+msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Αδύνατο το κλείδωμα του καταλόγου"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)"
+
+#: apt-pkg/acquire.cc:901
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Λήψη αρχείου %li του %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
+"στη θέση τους."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr ""
+"Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
+msgid "Could not configure '%s'. "
+msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Αυτή η προσπάθεια εγκατάστασης απαιτεί προσωρινή αφαίρεση του σημαντικού "
+"πακέτου %s λόγω ενός βρόγχου Ασυμβατότητας/ΠροΕξάρτησης. Αυτό συνήθως δεν "
+"είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την "
+"επιλογή APT::Force-LoopBreak option."
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Αποπροσάρτηση του CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Χρησιμοποιείται το σημείο προσάρτησης %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Αποπροσάρτηση του CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Αναμονή για δίσκο...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Προσάρτηση του CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Αναγνώριση..."
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Αποθήκευση Ετικέτας: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Αποπροσάρτηση του CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Σάρωση του δίσκου για περιεχόμενα...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3188,22 +2401,22 @@ msgstr ""
 "Βρέθηκαν %zu κατάλογοι πακέτων, %zu κατάλογοι πηγαίων, %zu κατάλογοι "
 "μεταφράσεων και %zu υπογραφές\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Εύρεση ετικέτας: %s \n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3212,302 +2425,1124 @@ msgstr ""
 "Ο δίσκος αυτός ονομάζεται: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Αντιγραφή λιστών πακέτων..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Eγγραφή νέας λίστας πηγών\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Εγιναν %i εγγραφές.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση "
+"κάποιας κατάλληλης αρχείοθήκης."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως "
+"προκλήθηκε από κρατούμενα πακέτα."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Υποψήφιες Εκδόσεις"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Παραγωγή Εξαρτήσεων"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n"
+msgid "Failed to open StateFile %s"
+msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+msgid "Unable to parse package file %s (1)"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Ανόμοιο MD5Sum"
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
+
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
-"στη θέση τους."
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Άνοιγμα του %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Εγκατάσταση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Ρύθμιση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Αφαιρώ το %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Το %s διαγράφηκε πλήρως"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Εκτέλεση του post-installation trigger %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Ο φάκελος %s αγνοείται."
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Προετοιμασία του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Ξεπακετάρισμα του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Προετοιμασία ρύθμισης του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Έγινε εγκατάσταση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Προετοιμασία για την αφαίρεση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Αφαίρεσα το %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Το %s διαγράφηκε πλήρως"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Αδύνατη η εγγραφή στο %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Η επιλογή %s δε βρέθηκε"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+"Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος "
+"%s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Αδύνατο το κλείδωμα %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Αποτυχία εκτέλεσης του συμπιεστή "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Σφάλμα!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Ολοκληρώθηκε"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Ολοκληρώθηκε"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Αδύνατο το άνοιγμα του %s"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Αδύνατη η εκτέλεση"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Αποτυχία εγγραφής του αρχείου %s"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα."
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Εγκατάλειψη της εγκατάστασης."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Η επιλογή γραμμής εντολών '%c' [από %s] δεν είναι γνωστή."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Η επιλογή γραμμής εντολών %s δεν είναι κατανοητή"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Η επιλογή γραμμής εντολών %s δεν είναι boolean"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Η επιλογή %s απαιτεί ένα όρισμα."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"Επιλογή %s: Οι προδιαγραφές του αντικειμένου ρυθμίσεων απαιτούν =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Επιλογή %s: απαιτείται ένας ακέραιος αριθμός ως όρισμα, όχι '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Η επιλογή '%s' έχει υπερβολικό μήκος"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Η τιμή %s δεν είναι κατανοητή, δοκιμάστε σωστό (true) ή λάθος (false)."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Μη έγκυρη λειτουργία %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n"
+"\n"
+"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n"
+"και πρότυπα από πακέτα debian\n"
+"\n"
+"Επιλογές:\n"
+"  -h   Το παρόν κείμενο βοήθειας\n"
+"  -t   Καθορισμός προσωρινού καταλόγου\n"
+"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
+"  -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Αδύνατη η εύρεση της κατάστασης του %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Σφάλμα επεξεργασίας του καταλόγου %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Χρήση: apt-ftparchive [επιλογές] εντολή\n"
+"Εντολές: 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 παράγει αρχεία περιεχομένων για τις αρχειοθήκες Debian\n"
+"Υποστηρίζει πολλές παραλλαγές παραγωγής, από απόλυτα αυτοματοποιημένες έως\n"
+"λειτουργικές αντικαταστάσεις για την dpkg-scanpackages και dpkg-scansources\n"
+"\n"
+"Το apt-ftparchive παράγει αρχεία Package από ένα σύνολο αρχείων .debs. Στο\n"
+"αρχείο Package περιέχονται όλα τα πεδία ελέγχου κάθε πακέτου καθώς και\n"
+"το μέγεθος τους και το MD5 hash. Υποστηρίζει την ύπαρξη αρχείου παράκαμψης\n"
+"για τη βεβιασμένη αλλαγή των πεδίων Priority (Προτεραιότητα) και Section\n"
+"(Τομέας).\n"
+"\n"
+"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από μια\n"
+"ιεραρχία αρχείων .dsc. Η επιλογή --source-override μπορεί να χρησιμοποιηθεί\n"
+"για παράκαμψη των αρχείων πηγών src.\n"
+"\n"
+"Οι εντολές 'packages' και 'sources' θα πρέπει να εκτελούνται στον βασικό\n"
+"κατάλογο της ιεραρχίας.Το BinaryPath θα πρέπει να δείχνει στον αρχικό\n"
+"κατάλογο που θα ξεκινάει η αναδρομική αναζήτηση και το αρχείο παράκαμψης\n"
+"θα πρέπει να περιέχει τις επιλογές παράκαμψης. Το Pathprefix προστίθεται "
+"στα\n"
+"πεδία όνομάτων αρχείων, αν υπάρχει. Δείτε παράδειγμα χρήσης στην αρχειοθήκη\n"
+"πακέτων του Debian :\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Επιλογές:\n"
+"  -h    Αυτό το κείμενο βοηθείας\n"
+"  --md5 Έλεγχος παραγωγής MD5\n"
+"  -s=?  αρχείο παράκαμψης πηγών\n"
+"  -q    Χωρίς έξοδο\n"
+"  -d=?  Επιλογή προαιρετικής βάσης δεδομένων cache\n"
+"  --no-delink Αποσφαλμάτωση του delinking\n"
+"  --contents  Έλεγχος παραγωγής αρχείου περιεχομένων\n"
+"  -c=?  Χρήση αυτού του αρχείου ρυθμίσεων\n"
+"  -o=?  Ορισμός αυθαίρετης επιλογής ρύθμισης"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Δεν ταιριαξε καμία επιλογή"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s"
+
+#: ftparchive/cachedb.cc:80
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη "
+"έκδοση, παρακαλώ αφαιρέστε και δημιουργήστε τη βάση εκ νέου."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Αδύνατη η πρόσβαση σε δείκτη"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Αδύνατη η ανάγνωση του καταλόγου  %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Σφάλματα στο αρχείο"
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Αδύνατη η εύρεση του %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Αποτυχία ανεύρεσης"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Αποτυχία ανοίγματος του %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr "Αποσύνδεση %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Αποτυχία ανάγνωσης του %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Αποτυχία αποσύνδεσης του %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "    Αποτυχία σύνδεσης του %s με το %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Αποσύνδεση ορίου του %sB hit.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s δεν περιέχει εγγραφή παράκαμψης\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s συντηρητής είναι ο %s όχι ο %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realoc - Αδυναμία εκχώρησης μνήμης"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Αδύνατο το άνοιγμα του %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Άγνωστος Αλγόριθμος Συμπίεσης '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Η συμπιεσμένη έξοδος του %s χρειάζεται καθορισμό συμπίεσης"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Αποτυχία δημιουργίας του ΑΡΧΕΙΟΥ"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Αποτυχία αγκίστρωσης"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Συμπίεση απογόνου"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Πρόβλημα κατά την αποσύνδεση του %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n"
+"\n"
+"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n"
+"και πρότυπα από πακέτα debian\n"
+"\n"
+"Επιλογές:\n"
+"  -h   Το παρόν κείμενο βοήθειας\n"
+"  -t   Καθορισμός προσωρινού καταλόγου\n"
+"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
+"  -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Άγνωστη εγγραφή πακέτου!"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Χρήση: apt-sortpkgs [παράμετροι] file1 [file2 ...]\n"
+"\n"
+"το apt-sortpkgs είναι ένα απλό εργαλείο για να ταξινομήσετε αρχεία πηγαίου "
+"κώδικα. Η επιλογή\n"
+"-s δείχνει τον τύπο του αρχείου.\n"
+"\n"
+"Παράμετροι:\n"
+"  -h   Αυτό το κείμενο βοήθειας\n"
+"  -s   Χρήση του τύπου αρχείου\n"
+"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
+"  -o=? Θέσε μια αυθαίρετη παράμετρο,πχ -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "Το %s δεν είναι έγκυρο πακέτο DEB."
 
diff --git a/po/es.po b/po/es.po
index 6848f4678..2a446cf91 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2011-01-24 11:47+0100\n"
 "Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -72,154 +72,155 @@ msgstr ""
 "X-POFile-SpellExtra: autoclean showsrc desactualizados clean gzip TYPE\n"
 "X-POFile-SpellExtra: sinfo Acquire\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Nombres de paquetes totales: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Estructuras de paquetes totales: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Paquetes normales: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuales puros: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuales únicos: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuales mixtos: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Faltan: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Versiones diferentes totales: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Descripciones diferentes totales: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Dependencias totales: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Relaciones versión/archivo totales: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Relaciones descripción/archivo totales: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Mapeo Total de Provisiones: "
 
 # globbed -> globalizadas ? (jfs)
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Cadenas globalizadas totales: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Espacio de versión de dependencias total: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Espacio desperdiciado total: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Espacio registrado total: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "El archivo de paquetes %s está desincronizado."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "No se encontró ningún paquete"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Debe proporcionar al menos un patrón de búsqueda"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "No se ha podido localizar el paquete %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Archivos de paquetes:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Paquetes con pin:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(no encontrado)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Instalados: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Pin del paquete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Tabla de versión:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -297,29 +298,29 @@ msgstr ""
 "       p.ej. -o dir::cache=/tmp\n"
 "Vea las páginas del manual apt-cache(8) y apt.conf(5) para más información.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Proporcione un nombre para este disco, como pueda ser «Debian 5.0.3 Disco 1»"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Por favor, introduzca un disco en la unidad y pulse Intro"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "No se pudo montar «%s» como «%s»"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repita este proceso para el resto de los CDs del conjunto."
 
@@ -356,66 +357,66 @@ msgstr ""
 "  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
 "       cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Escogiendo «%s» como paquete fuente en lugar de «%s»\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Ignorar la versión no disponible «%s» del paquete «%s»"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No se pudo encontrar el paquete %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "fijado %s como instalado manualmente.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "fijado %s como instalado automáticamente.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Error interno, el sistema de solución de problemas rompió algunas cosas"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "No se puede bloquear el directorio de descarga"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No se pudo encontrar un paquete de fuentes para %s"
@@ -442,97 +443,97 @@ msgstr ""
 "para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
 "del paquete.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omitiendo el fichero ya descargado «%s»\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No pude determinar el espacio libre en %s"
 
-#: cmdline/apt-get.cc:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Necesito descargar %sB de archivos fuente.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fuente obtenida %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "No se pudieron obtener algunos archivos."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en modo de sólo descarga"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Falló la orden de desempaquetamiento «%s».\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orden de construcción «%s».\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Falló el proceso hijo"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Debe especificar al menos un paquete para verificar sus dependencias de "
 "construcción"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no tiene dependencias de construcción.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -541,7 +542,7 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -550,14 +551,14 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -566,7 +567,7 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque ninguna versión "
 "disponible del paquete %s satisface los requisitos de versión"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -575,30 +576,30 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, 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:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "No se pudieron procesar las dependencias de construcción"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectando a %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -689,53 +690,74 @@ msgstr ""
 "para más información y opciones.\n"
 "                       Este APT tiene poderes de Super Vaca.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Debe especificar al menos un paquete para obtener su código fuente"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "pero no está instalado"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "fijado %s como instalado manualmente.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "fijado %s como instalado automáticamente.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ya está en su versión más reciente.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ya está en su versión más reciente.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero no estaba allí"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "fijado %s como instalado manualmente.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "No se pudo abrir %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -762,7 +784,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -810,52 +832,52 @@ msgstr "No pude desmontar el CD-ROM de %s, tal vez todavía este en uso."
 msgid "Disk not found."
 msgstr "Disco no encontrado."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Fichero no encontrado"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "No pude leer"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "No pude poner el tiempo de modificación"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI inválido, los URIS locales no deben de empezar con //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Entrando"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "No pude determinar el nombre del par"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Imposible determinar el nombre local"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "El servidor rechazó nuestra conexión y dijo: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Usuario (USER) falló, el servidor dijo: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Clave (PASS) falló, el servidor dijo: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -863,121 +885,123 @@ msgstr ""
 "Se especificó un servidor proxy pero no un script de entrada, «Acquire::ftp::"
 "ProxyLogin» está vacío."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Falló la orden «%s» del script de entrada, el servidor dijo: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Tipo (TYPE) falló, el servidor dijo: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "La conexión expiró"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "El servidor cerró la conexión"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "No pude crear un socket."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Fallo del protocolo"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "No pude crear un socket"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Falló"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "No pude conectar un socket pasivo."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo no pude obtener un socket oyente"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "No pude ligar un socket"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "No pude escuchar en el socket"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "No pude determinar el nombre del socket"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "No pude mandar la orden PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Dirección de familia %u desconocida (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falló, el servidor dijo: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Expiró conexión a socket de datos"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "No pude aceptar la conexión"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Se produjo un problema al hacer un hash del archivo"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Imposible traer archivo, el servidor dijo «%s»"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Expiró el socket de datos"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Falló transferencia de datos, el servidor dijo «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "No pude invocar "
 
@@ -1013,7 +1037,7 @@ msgstr "No pude conectarme a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
@@ -1043,39 +1067,39 @@ msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "No se pudo conectar a %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Se encontró al menos una firma inválida."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "No se pudo ejecutar «gpgv»  para verificar la firma (¿está instalado gpgv?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Error desconocido ejecutando gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Las siguientes firms fueron inválidas:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1083,119 +1107,353 @@ msgstr ""
 "Las firmas siguientes no se pudieron verificar porque su llave pública no "
 "está disponible:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Falló la selección"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Expiró la conexión"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Error escribiendo al archivo de salida"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Esperando las cabeceras"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Mala línea de cabecera"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El servidor de http envió una cabecera de respuesta inválida"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "El servidor de http envió una cabecera de Content-Length inválida"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "El servidor de http envió una cabecera de Content-Range inválida"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Éste servidor de http tiene el soporte de alcance roto"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Formato de fecha desconocido"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Mala cabecera Data"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Fallo la conexión"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Error interno"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calculando la actualización... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Error Interno, AllUpgrade rompió cosas"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Listo"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Corrigiendo dependencias..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falló."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "No se puede corregir las dependencias"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "No se puede minimizar el conjunto de actualización"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Listo"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "pero %s está instalado"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "pero %s va a ser instalado"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "pero no es instalable"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "pero es un paquete virtual"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "pero no está instalado"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "pero no va a instalarse"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Se instalarán los siguientes paquetes NUEVOS:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Los siguientes paquetes se ELIMINARÁN:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Los siguientes paquetes se han retenido:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Se actualizarán los siguientes paquetes:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Se cambiarán los siguientes paquetes retenidos:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
+"¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualizados, %lu se instalarán, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualizados, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu para eliminar y %lu no actualizados.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu no instalados del todo o eliminados.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error de compilación de expresiones regulares - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "El comando de actualización no toma argumentos"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Los paquetes necesitan eliminarse pero está deshabilitado la posibilidad de "
 "eliminar."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error interno, no terminó la ordenación"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
-"Qué raro.. Los tamaños no concuerdan, mande un correo a apt@packages.debian."
+"Qué raro... Los tamaños no concuerdan, mande un correo a apt@packages.debian."
 "org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Se necesita descargar %sB/%sB de archivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Necesito descargar %sB de archivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1203,31 +1461,31 @@ msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "No tiene suficiente espacio libre en %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hay problemas y se utilizó -y sin --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Se especificó Trivial Only pero ésta no es una operación trivial."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Sí, ¡haga lo que le digo!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1238,19 +1496,19 @@ msgstr ""
 "Para continuar escriba la frase «%s»\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Abortado."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "¿Desea continuar?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "No se pudieron descargar algunos archivos"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1258,19 +1516,19 @@ msgstr ""
 "No se pudieron obtener algunos archivos, ¿quizás deba ejecutar «apt-get "
 "update» o deba intentarlo de nuevo con --fix-missing?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Actualmente no están soportados --fix-missing e intercambio de medio"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "No se pudieron corregir los paquetes que faltan."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Abortando la instalación."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1284,16 +1542,16 @@ msgstr[1] ""
 "Los paquetes mostrados a continuación han desaparecido de su sistema\n"
 "dado que todos sus ficheros han sido sobreescritos por otros paquetes:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: Dpkg realiza esto de forma automática y a propósito."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 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»"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1311,15 +1569,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente información puede ayudar a resolver la situación:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error interno, «AutoRemover» rompió cosas"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1332,7 +1590,7 @@ msgstr[1] ""
 "Los paquetes indicados a continuación se instalaron de forma automática y ya "
 "no son necesarios."
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1341,18 +1599,18 @@ msgstr[0] "Se instaló de forma automática %lu paquete y ya no es necesario.\n"
 msgstr[1] ""
 "Se instalaron de forma automática %lu paquetes y ya no son necesarios.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Utilice «apt-get autoremove» para eliminarlos."
 msgstr[1] "Utilice «apt-get autoremove» para eliminarlos."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1360,7 +1618,7 @@ msgstr ""
 "Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o "
 "especifique una solución)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1372,322 +1630,96 @@ msgstr ""
 "inestable, que algunos paquetes necesarios no han sido creados o han\n"
 "sido movidos fuera de Incoming."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Se instalarán los siguientes paquetes extras:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Paquetes sugeridos:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 es sólo una simulación\n"
+"      apt-get necesita privilegios de administrador para la ejecución real.\n"
+"      Tenga también en cuenta que se han desactivado los bloqueos,\n"
+"      ¡no dependa de la relevancia a la situación real actual!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticación ignorado.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Algunos paquetes no se pueden autenticar"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "¿Instalar estos paquetes sin verificación?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Imposible obtener %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "pero %s está instalado"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "pero %s va a ser instalado"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "pero no es instalable"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "pero es un paquete virtual"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "pero no está instalado"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "pero no va a instalarse"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Se instalarán los siguientes paquetes NUEVOS:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Los siguientes paquetes se ELIMINARÁN:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Los siguientes paquetes se han retenido:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Se actualizarán los siguientes paquetes:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Se cambiarán los siguientes paquetes retenidos:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (por %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
-"¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualizados, %lu se instalarán, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu desactualizados, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu para eliminar y %lu no actualizados.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu no instalados del todo o eliminados.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Error de compilación de expresiones regulares - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Corrigiendo dependencias..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "No se puede corregir las dependencias"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "No se puede minimizar el conjunto de actualización"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Listo"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "El comando de actualización no toma argumentos"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Calculando la actualización... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Error Interno, AllUpgrade rompió cosas"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Listo"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 es sólo una simulación\n"
-"      apt-get necesita privilegios de administrador para la ejecución real.\n"
-"      Tenga también en cuenta que se han desactivado los bloqueos,\n"
-"      ¡no dependa de la relevancia a la situación real actual!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "No pude abrir %s.new"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Obj "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Des:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Descargados %sB en %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Trabajando]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1700,19 +1732,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "No pude leer %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "No se pudo cambiar a %s"
@@ -1741,11 +1773,11 @@ msgstr "No se encontró un archivo de réplica «%s»"
 msgid "[Mirror: %s]"
 msgstr "[Réplica: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Falló la creación de una tubería IPC para el subproceso"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "La conexión se cerró prematuramente"
 
@@ -1789,1381 +1821,484 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Fusionando información disponible"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
-"\n"
-"apt-extracttemplates es una herramienta para extraer información de\n"
-"configuración y plantillas de paquetes de debian.\n"
-"\n"
-"Opciones:\n"
-"  -h   Este texto de ayuda.\n"
-"  -t   Define el directorio temporal\n"
-"  -c=? Lee este archivo de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
-"cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "No se puede escribir en %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "La lista de extensión de paquetes es demasiado larga"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Error procesando el directorio %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "La lista de extensión de fuentes es demasiado larga"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Error escribiendo cabeceras de archivos de contenido"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Error procesando contenidos %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 [opciones] orden\n"
-"Comandos: packages ruta-binaria [archivo-predominio\n"
-"                                      [prefijo-ruta]]\n"
-"          sources ruta-fuente [archivo-predominio \n"
-"                                     [prefijo-ruta]]\n"
-"          contents ruta\n"
-"          release ruta\n"
-"          generate config [grupos]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive genera índices para archivos de Debian. Soporta\n"
-"varios estilos de generación de reemplazos desde los completamente\n"
-"automatizados a los funcionales para dpkg-scanpackages y dpkg-scansources.\n"
-"\n"
-"apt-ftparchive genera ficheros Package de un árbol de .debs. El fichero\n"
-"Package contiene los contenidos de todos los campos de control de cada\n"
-"paquete al igual que la suma MD5 y el tamaño del archivo. Se puede usar\n"
-"un archivo de predominio para forzar el valor de Priority y\n"
-"Section.\n"
-"\n"
-"Igualmente, apt-ftparchive genera ficheros Sources para un árbol de\n"
-".dscs. Se puede utilizar la opción --source-override para especificar un\n"
-"fichero de predominio de fuente.\n"
-"\n"
-"Las órdenes «packages» y «sources» deben ejecutarse en la raíz del\n"
-"árbol. BinaryPath debe apuntar a la base de la búsqueda\n"
-"recursiva, y el archivo de predominio debe de contener banderas de\n"
-"predominio. Se añade Pathprefix a los campos de nombre de fichero\n"
-"si existen. A continuación se muestra un ejemplo de uso basado en los \n"
-"archivos de Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opciones:\n"
-"  -h    Este texto de ayuda\n"
-"  --md5 Generación de control MD5 \n"
-"  -s=?  Archivo fuente de predominio\n"
-"  -q    Silencioso\n"
-"  -d=?  Selecciona la base de datos de caché opcional \n"
-"  --no-delink Habilita modo de depuración delink\n"
-"  --contents  Generación del contenido del archivo «Control»\n"
-"  -c=?  Lee este archivo de configuración\n"
-"  -o=?  Establece una opción de configuración arbitraria"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Ninguna selección coincide"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Faltan algunos archivos en el grupo de archivo de paquetes «%s»"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "BD dañada, se renombró el archivo a %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB anticuada, intentando actualizar %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"El formato de la base de datos no es válido. Debe eliminar y recrear la base "
-"de datos si vd. se actualizó de una versión anterior de apt."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "No se pudo abrir el archivo DB %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "No pude leer %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "No hay registro de control del archivo"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "No se pudo obtener un cursor"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: No se pudo leer directorio %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: No se pudo leer %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "A: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Errores aplicables al archivo "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "No se pudo resolver %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Falló el recorrido por el árbol."
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "No se pudo abrir %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "No se pudo leer el enlace %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "No se pudo desligar %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** No pude enlazar %s con %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink se ha llegado al límite de %sB.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Archivo no tiene campo de paquetes"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s no tiene entrada de predominio\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " el encargado de %s es %s y no %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s no tiene una entrada fuente predominante\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s tampoco tiene una entrada binaria predominante\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - No pudo reservar memoria"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "No se pudo abrir %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Predominio mal formado %s línea %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "No se pudo leer el archivo de predominio %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Predominio mal formado %s línea %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Predominio mal formado %s línea %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Predominio mal formado %s línea %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo desconocido de compresión «%s»"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Salida comprimida %s necesita una herramienta de compresión"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "No se pudo crear FICHERO*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "No se pudo bifurcar"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Hijo compresión"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Error interno, no se pudo crear %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Falló la ES a subproceso/archivo"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "No se pudo leer mientras se computaba MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Se produjo un problema al desligar %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Falló el renombre de %s a %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
-"\n"
-"apt-extracttemplates es una herramienta para extraer información de\n"
-"configuración y plantillas de paquetes de debian.\n"
-"\n"
-"Opciones:\n"
-"  -h   Este texto de ayuda.\n"
-"  -t   Define el directorio temporal\n"
-"  -c=? Lee este archivo de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
-"cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "¡Registro de paquete desconocido!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Uso: apt-sortpkgs [opciones] archivo1 [archivo2 ...]\n"
-"\n"
-"apt-sortpkgs es una herramienta sencilla para ordenar archivos de paquetes.\n"
-"La opción -s se utiliza para indicar qué tipo de archivo es.\n"
-"\n"
-"Opciones:\n"
-"  -h   Este texto de ayuda.\n"
-"  -s   Utiliza ordenamiento de archivos fuente\n"
-"  -c=? Lee este archivo de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
-"cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "No pude crear las tuberías"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "No pude ejecutar gzip"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Archivo dañado"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr ""
-"Se produjo un fallo al calcular la suma de control de tar, archive dañado"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Firma del archivo inválida"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Error leyendo la cabecera de miembro del archivo"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Cabecera de miembro del archivo inválida %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Cabecera de miembro del archivo inválida"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "El archivo es muy pequeño"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "No pude leer las cabeceras del archivo"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode llamado en un nodo todavía ligado"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "¡No pude localizar el elemento enlazado!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "No pude asignar una desviación"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Error interno en AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Tratando de sobreescribir una desviación, %s -> %s y %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Doble suma de desviación %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Archivo de configuración duplicado %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Falló la escritura del archivo %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "No pude cerrar el archivo %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "La trayectoria %s es demasiado larga"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Desempaquetando %s más de una vez"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "El directorio %s está desviado"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "El paquete está tratando de escribir al blanco desviado %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "La trayectoria de desviación es demasiado larga"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "No pude leer %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Falló el renombre de %s a %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "El directorio %s está siendo reemplazado por un no-directorio"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "No pude localizar el nodo en su bote de enlace"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "La trayectoria es muy larga"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Sobreescribiendo concordancia del paquete sin versión para %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "No pude leer %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Falló la escritura del archivo %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "No pude cerrar el archivo %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Este no es un archivo DEB válido, falta el miembro «%s»"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Error interno, no pude localizar el miembro %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Archivo de control inanalizable"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "No puedo hacer mmap de un fichero vacío"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "No pude duplicar el descriptor de fichero %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "No pude hacer mmap de %lu bytes"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "No se pudo cerrar «mmap»"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "No pude sincronizar «mmap»"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "No pude hacer mmap de %lu bytes"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Falló al truncar el archivo"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"La asignación dinámica MMap no tiene más espacio. Por favor, incrementa el "
-"valor de «APT::Cache-Start». El valor actual es: %lu (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"No se pudo incrementar el tamaño del MMap dado que se ha alcanzado ya el "
-"límite de %lu bytes."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"No se pudo incrementar el tamaño de MMap dado que el usuario ha "
-"deshabilitado el crecimiento automático."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin. %liseg."
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin. %liseg."
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin. %liseg."
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%liseg."
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selección %s no encontrada"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Tipo de abreviación no reconocida: «%c»"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Abriendo fichero de configuración %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, 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:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Error de sintaxis %s:%u: Marca mal formada"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Error de sintaxis %s:%u: Basura extra después del valor"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Firma del archivo inválida"
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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 en el primer "
-"nivel"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Error leyendo la cabecera de miembro del archivo"
 
-#: apt-pkg/contrib/configuration.cc:868
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Error de sintaxis %s:%u: Demasiadas inclusiones anidadas"
+msgid "Invalid archive member header %s"
+msgstr "Cabecera de miembro del archivo inválida %s"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Error de sintaxis %s:%u: Incluido desde aquí"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Cabecera de miembro del archivo inválida"
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Error de sintaxis %s:%u: Directiva «%s» no soportada"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "El archivo es muy pequeño"
 
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Error de sintaxis %s:%u: la directiva «clear» tiene que incluir un árbol de "
-"opciones como argumento"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "No pude leer las cabeceras del archivo"
 
-#: apt-pkg/contrib/configuration.cc:934
-#, 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"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "No pude crear las tuberías"
 
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... ¡Error!"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "No pude ejecutar gzip"
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Hecho"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Archivo dañado"
 
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
 msgstr ""
+"Se produjo un fallo al calcular la suma de control de tar, archive dañado"
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Hecho"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "No se conoce la opción de línea de órdenes «%c» [de %s]."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "No se entiende la opción de línea de órdenes %s"
-
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "La opción de línea de órdenes %s no es un booleano"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "La opción %s necesita un argumento."
+msgid "Unable to stat %s."
+msgstr "No se pudo leer %s."
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Opción %s: La especificación del elemento de configuración debe tener un "
-"=<val>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "La opción %s exige un argumento entero, no «%s»"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Opción «%s» demasiado larga"
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "El sentido %s no se entiende, pruebe verdadero o falso."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Operación inválida: %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-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:225
-msgid "Failed to stat the cdrom"
-msgstr "No pude montar el cdrom"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Se produjo un problema al cerrar el fichero gzip %s"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "No se utiliza bloqueos para el fichero de bloqueo de sólo lectura %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "No se pudo abrir el fichero de bloqueo «%s»"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Ejecutando dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s"
+msgid "Packaging system '%s' is not supported"
+msgstr "No está soportado el sistema de paquetes «%s»"
 
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "No se pudo bloquear %s"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgid "Wrote %i records.\n"
+msgstr "%i registros escritos.\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i registros escritos con %i fichero de menos.\n"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i registros escritos con %i fichero mal emparejado\n"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
+"%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n"
 
-#: apt-pkg/contrib/fileutl.cc:862
-#, 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:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "El subproceso %s recibió la señal %u."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, 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:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "El subproceso %s terminó de forma inesperada"
+msgid "Can't find authentication record for: %s"
+msgstr "No se pudo encontrar un registro de autenticación para: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file %s"
-msgstr "No pude abrir el fichero %s"
+msgid "Hash mismatch for: %s"
+msgstr "La suma hash difiere para: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "No se pudo abrir el descriptor de fichero %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "No se pudo crear el subproceso IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "No se pudo ejecutar el compresor "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "leídos, todavía debía leer %lu pero no queda nada"
+msgid "The method driver %s could not be found."
+msgstr "No se pudo encontrar el método %s."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo"
+msgid "Is the package %s installed?"
+msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "Se produjo un problema al cerrar el fichero %s"
+msgid "Method %s did not start correctly"
+msgstr "El método %s no se inició correctamente"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Se produjo un problema al renombrar el fichero %s a %s"
+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 pulse Intro."
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Se produjo un problema al desligar el fichero %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"No se pudieron analizar o abrir las listas de paquetes o el archivo de "
+"estado."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Se produjo un problema al sincronizar el fichero"
+#: apt-pkg/cachefile.cc:98
+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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No se instaló ningún anillo de claves %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "No se pudieron leer las listas de fuentes."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Caché de paquetes vacía."
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "El archivo de caché de paquetes está dañado"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 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:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "El archivo de caché de paquetes está dañado"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Esta versión de APT no soporta el sistema de versiones «%s»"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 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:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "PreDepende"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Sugiere"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Recomienda"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Entra en conflicto"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Reemplaza"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Hace obsoleto"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Mejora"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "requiere"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencias"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Versiones candidatas"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Generación de dependencias"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Leyendo la información de estado"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No se pudo abrir el fichero de estado %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del fichero de estado temporal %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "No se pudo tratar el archivo de paquetes %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "No se pudo tratar el archivo de paquetes %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Línea %lu mal formada en la lista de fuentes %s ([opción] no parseable)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene "
-"asociado un valor)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Línea %u demasiado larga en la lista de fuentes %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"No se pudo realizar la configuración inmediata de «%s». Consulte la página "
-"de manual con «man 5 apt.conf» bajo «APT::Immediate-Configure» para más "
-"información. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "No pude abrir el fichero «%s»"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ejecución de la instalación requiere eliminar temporalmente el paquete  "
-"esencial %s debido a un bucle de Conflictos/Pre-Dependencias. Esto  "
-"generalmente es malo, pero si realmente quiere hacerlo, active la opción |"
-"APT::Force-LoopBreak»."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "No se da soporte para el tipo de archivo de índice «%s»"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
-"éste."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido "
-"causado por paquetes retenidos."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"No se pudieron corregir los problemas, usted ha retenido paquetes rotos."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Falta el directorio de listas %spartial."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Falta el directorio de archivos %spartial."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "No se pudo bloquear el directorio %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Descargando fichero %li de %li (falta %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Descargando fichero %li de %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "No se pudo encontrar el método %s."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El método %s no se inició correctamente"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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 pulse Intro."
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "No está soportado el sistema de paquetes «%s»"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "No se pudo leer %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Debe poner algunos URIs fuente («source») en su sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"No se pudieron analizar o abrir las listas de paquetes o el archivo de "
-"estado."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "No se pudieron leer las listas de fuentes."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-"Registro inválido en el archivo de preferencias %s, no hay cabecera «Package»"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "No se entiende el pin tipo %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "No hay prioridad especificada para pin (o es cero)"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "La caché tiene una versión incompatible de sistema de versiones"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Se produjo un error mientras se procesaba %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Vaya, excedió el número de nombres de paquetes que este APT es capaz de "
 "manejar."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Vaya, excedió el número de versiones que este APT es capaz de manejar."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Vaya, excedió el número de descripciones que este APT es capaz de manejar."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Vaya, excedió el número de dependencias que este APT es capaz de manejar."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Al procesar las dependencias de archivos no se encontró el paquete %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "No se puede leer la lista de paquetes fuente %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Leyendo lista de paquetes"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Recogiendo archivos que proveen"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "No se puede escribir en %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Error de E/S guardando caché fuente"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falló el cambio de nombre, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "La suma hash difiere"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "El tamaño difiere"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operación inválida: %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "No se pudo leer el archivo «Release» %s"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "No existe ninguna clave pública disponible para los siguientes "
 "identificadores de clave:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3174,12 +2309,12 @@ msgstr ""
 "GPG es: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Error de GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3189,12 +2324,12 @@ msgstr ""
 "que necesita arreglar manualmente este paquete (debido a que falta una "
 "arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3202,71 +2337,136 @@ msgstr ""
 "Los archivos de índice de paquetes están dañados. No existe un campo "
 "«Filename:» para el paquete %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "No se pudo leer el archivo «Release» %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Bloque de fabricante %s sin huella digital"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "No se encontraron secciones en el archivo «Release» %s"
+msgid "List directory %spartial is missing."
+msgstr "Falta el directorio de listas %spartial."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "No existe una entrada «Hash» en el archivo «Release» %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Falta el directorio de archivos %spartial."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Entrada «Valid-Until» inválida en el archivo «Release» %s"
+msgid "Unable to lock directory %s"
+msgstr "No se pudo bloquear el directorio %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrada «Date» inválida en el archivo «Release» %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Descargando fichero %li de %li (falta %s)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Bloque de fabricante %s sin huella digital"
+msgid "Retrieving file %li of %li"
+msgstr "Descargando fichero %li de %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"No se han podido descargar algunos archivos de índice, se han ignorado, o se "
+"ha utilizado unos antiguos en su lugar."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Debe poner algunos URIs fuente («source») en su sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
+"Registro inválido en el archivo de preferencias %s, no hay cabecera «Package»"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "No se entiende el pin tipo %s"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "No hay prioridad especificada para pin (o es cero)"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"No se pudo realizar la configuración inmediata de «%s». Consulte la página "
+"de manual con «man 5 apt.conf» bajo «APT::Immediate-Configure» para más "
+"información. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "No pude abrir el fichero «%s»"
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ejecución de la instalación requiere eliminar temporalmente el paquete  "
+"esencial %s debido a un bucle de Conflictos/Pre-Dependencias. Esto  "
+"generalmente es malo, pero si realmente quiere hacerlo, active la opción |"
+"APT::Force-LoopBreak»."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Línea %u demasiado larga en la lista de fuentes %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Desmontando el CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Usando el punto de montaje del CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Desmontando el CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Esperando el disco...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Montando el CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "Identificando.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "Identificando... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etiqueta guardada: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Desmontando el CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Buscando en el disco archivos de índices...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3275,7 +2475,7 @@ msgstr ""
 "Se encontraron %zu índices de paquetes, %zu índices de fuentes, %zu índices "
 "de traducción y %zu firmas\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3283,16 +2483,16 @@ msgstr ""
 "No pude localizar ningún archivo de paquete, ¿quizás este no sea un disco de "
 "Debian o sea de otra arquitectura?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Se encontró la etiqueta: «%s»\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Ese no es un nombre válido, inténtelo de nuevo.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3301,82 +2501,108 @@ msgstr ""
 "Este disco se llama: \n"
 "«%s»\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Copiando las listas de paquetes..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Escribiendo nueva lista de fuente\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 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:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i registros escritos.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
+"éste."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i registros escritos con %i fichero de menos.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido "
+"causado por paquetes retenidos."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"No se pudieron corregir los problemas, usted ha retenido paquetes rotos."
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencias"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiones candidatas"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generación de dependencias"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Leyendo la información de estado"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i registros escritos con %i fichero mal emparejado\n"
+msgid "Failed to open StateFile %s"
+msgstr "No se pudo abrir el fichero de estado %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del fichero de estado temporal %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "No se pudo encontrar un registro de autenticación para: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "No se pudo tratar el archivo de paquetes %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "La suma hash difiere para: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "No se pudo tratar el archivo de paquetes %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "No se encontró la Distribución «%s» para «%s»"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "No se encontró la versión «%s» para «%s»"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "No se pudo encontrar la tarea «%s»"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "No se pueden seleccionar distintas versiones del paquete «%s» porque es "
 "puramente virtual"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3385,179 +2611,247 @@ msgstr ""
 "No se puede seleccionar una versión instalada o candidata para el paquete "
 "«%s» dado que éste no tiene ninguna de éstas"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "No se puede seleccionar la última versión del paquete «%s» dado que es "
 "puramente virtual"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "No se puede seleccionar una versión candidata del paquete %s dado que no "
 "tiene candidatos"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "No se puede seleccionar una versión instalada del paquete «%s» puesto que no "
 "está instalado"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "No se pudo leer el archivo «Release» %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "No se encontraron secciones en el archivo «Release» %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "No existe una entrada «Hash» en el archivo «Release» %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Entrada «Valid-Until» inválida en el archivo «Release» %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrada «Date» inválida en el archivo «Release» %s"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
+
+#: apt-pkg/sourcelist.cc:170
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Línea %lu mal formada en la lista de fuentes %s ([opción] no parseable)"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
+"Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
+"Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
+"Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
+"Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene "
+"asociado un valor)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Ejecutando dpkg"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"No se han podido descargar algunos archivos de índice, se han ignorado, o se "
-"ha utilizado unos antiguos en su lugar."
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Abriendo %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Borrando completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Se detectó la desaparición de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Ejecutando disparador post-instalación %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta el directorio «%s»."
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "No pude abrir el fichero «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparándose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparándose para eliminar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s eliminado"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparándose para eliminar completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Se borró completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "No se puede escribir en %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de "
 "«MaxReports»"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - dejando sin instalar"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3565,7 +2859,7 @@ msgstr ""
 "No se escribió un informe «apport» porque el mensaje de error indica que es "
 "un mensaje de error asociado a un fallo previo."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3573,7 +2867,7 @@ msgstr ""
 "No se escribió un informe «apport» porque el mensaje de error indica que el "
 "error es de disco lleno"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3581,7 +2875,7 @@ msgstr ""
 "No se escribió un informe «apport» porque el mensaje de error indica un "
 "error de memoria excedida"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3590,14 +2884,14 @@ msgstr ""
 "No se escribió un informe «apport» porque el mensaje de error indica que el "
 "error es de disco lleno"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "No se escribió un informe «apport» porque el mensaje de error indica un "
 "error de E/S de dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3606,14 +2900,14 @@ msgstr ""
 "No se pudo bloquear el directorio de administración (%s), ¿quizás haya algún "
 "otro proceso utilizándolo?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "No se encontró un archivo de réplica «%s»"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3621,10 +2915,749 @@ msgstr ""
 "se interrumpió la ejecución de dpkg, debe ejecutar manualmente «%s» para "
 "corregir el problema"
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "No bloqueado"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin. %liseg."
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin. %liseg."
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin. %liseg."
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%liseg."
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selección %s no encontrada"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "No se utiliza bloqueos para el fichero de bloqueo de sólo lectura %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "No se pudo abrir el fichero de bloqueo «%s»"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "No se pudo bloquear %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, 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:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "El subproceso %s recibió la señal %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "El subproceso %s terminó de forma inesperada"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Se produjo un problema al cerrar el fichero gzip %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "No pude abrir el fichero %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "No se pudo abrir el descriptor de fichero %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "No se pudo crear el subproceso IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "No se pudo ejecutar el compresor "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "leídos, todavía debía leer %lu pero no queda nada"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Se produjo un problema al cerrar el fichero %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Se produjo un problema al renombrar el fichero %s a %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Se produjo un problema al desligar el fichero %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Se produjo un problema al sincronizar el fichero"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... ¡Error!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Hecho"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Hecho"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "No puedo hacer mmap de un fichero vacío"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "No pude duplicar el descriptor de fichero %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "No pude hacer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "No se pudo cerrar «mmap»"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "No pude sincronizar «mmap»"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "No pude hacer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Falló al truncar el archivo"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"La asignación dinámica MMap no tiene más espacio. Por favor, incrementa el "
+"valor de «APT::Cache-Start». El valor actual es: %lu (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"No se pudo incrementar el tamaño del MMap dado que se ha alcanzado ya el "
+"límite de %lu bytes."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"No se pudo incrementar el tamaño de MMap dado que el usuario ha "
+"deshabilitado el crecimiento automático."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+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:246
+msgid "Failed to stat the cdrom"
+msgstr "No pude montar el cdrom"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Tipo de abreviación no reconocida: «%c»"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Abriendo fichero de configuración %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Error de sintaxis %s:%u: Marca mal formada"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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 en el primer "
+"nivel"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Error de sintaxis %s:%u: Incluido desde aquí"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, 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:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Error de sintaxis %s:%u: la directiva «clear» tiene que incluir un árbol de "
+"opciones como argumento"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, 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"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "No se instaló ningún anillo de claves %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "No se conoce la opción de línea de órdenes «%c» [de %s]."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "No se entiende la opción de línea de órdenes %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "La opción de línea de órdenes %s no es un booleano"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "La opción %s necesita un argumento."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"Opción %s: La especificación del elemento de configuración debe tener un "
+"=<val>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "La opción %s exige un argumento entero, no «%s»"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opción «%s» demasiado larga"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "El sentido %s no se entiende, pruebe verdadero o falso."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Operación inválida: %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
+"\n"
+"apt-extracttemplates es una herramienta para extraer información de\n"
+"configuración y plantillas de paquetes de debian.\n"
+"\n"
+"Opciones:\n"
+"  -h   Este texto de ayuda.\n"
+"  -t   Define el directorio temporal\n"
+"  -c=? Lee este archivo de configuración\n"
+"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
+"cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "No pude leer %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "La lista de extensión de paquetes es demasiado larga"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Error procesando el directorio %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "La lista de extensión de fuentes es demasiado larga"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Error escribiendo cabeceras de archivos de contenido"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Error procesando contenidos %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 [opciones] orden\n"
+"Comandos: packages ruta-binaria [archivo-predominio\n"
+"                                      [prefijo-ruta]]\n"
+"          sources ruta-fuente [archivo-predominio \n"
+"                                     [prefijo-ruta]]\n"
+"          contents ruta\n"
+"          release ruta\n"
+"          generate config [grupos]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive genera índices para archivos de Debian. Soporta\n"
+"varios estilos de generación de reemplazos desde los completamente\n"
+"automatizados a los funcionales para dpkg-scanpackages y dpkg-scansources.\n"
+"\n"
+"apt-ftparchive genera ficheros Package de un árbol de .debs. El fichero\n"
+"Package contiene los contenidos de todos los campos de control de cada\n"
+"paquete al igual que la suma MD5 y el tamaño del archivo. Se puede usar\n"
+"un archivo de predominio para forzar el valor de Priority y\n"
+"Section.\n"
+"\n"
+"Igualmente, apt-ftparchive genera ficheros Sources para un árbol de\n"
+".dscs. Se puede utilizar la opción --source-override para especificar un\n"
+"fichero de predominio de fuente.\n"
+"\n"
+"Las órdenes «packages» y «sources» deben ejecutarse en la raíz del\n"
+"árbol. BinaryPath debe apuntar a la base de la búsqueda\n"
+"recursiva, y el archivo de predominio debe de contener banderas de\n"
+"predominio. Se añade Pathprefix a los campos de nombre de fichero\n"
+"si existen. A continuación se muestra un ejemplo de uso basado en los \n"
+"archivos de Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opciones:\n"
+"  -h    Este texto de ayuda\n"
+"  --md5 Generación de control MD5 \n"
+"  -s=?  Archivo fuente de predominio\n"
+"  -q    Silencioso\n"
+"  -d=?  Selecciona la base de datos de caché opcional \n"
+"  --no-delink Habilita modo de depuración delink\n"
+"  --contents  Generación del contenido del archivo «Control»\n"
+"  -c=?  Lee este archivo de configuración\n"
+"  -o=?  Establece una opción de configuración arbitraria"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Ninguna selección coincide"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Faltan algunos archivos en el grupo de archivo de paquetes «%s»"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "BD dañada, se renombró el archivo a %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB anticuada, intentando actualizar %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"El formato de la base de datos no es válido. Debe eliminar y recrear la base "
+"de datos si vd. se actualizó de una versión anterior de apt."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "No se pudo abrir el archivo DB %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "No hay registro de control del archivo"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "No se pudo obtener un cursor"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "A: No se pudo leer directorio %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "A: No se pudo leer %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "A: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Errores aplicables al archivo "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "No se pudo resolver %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Falló el recorrido por el árbol."
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "No se pudo abrir %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "No se pudo leer el enlace %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "No se pudo desligar %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** No pude enlazar %s con %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink se ha llegado al límite de %sB.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Archivo no tiene campo de paquetes"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr " %s no tiene entrada de predominio\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr " el encargado de %s es %s y no %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr " %s no tiene una entrada fuente predominante\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr " %s tampoco tiene una entrada binaria predominante\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - No pudo reservar memoria"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "No se pudo abrir %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Predominio mal formado %s línea %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "No se pudo leer el archivo de predominio %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Predominio mal formado %s línea %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Predominio mal formado %s línea %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Predominio mal formado %s línea %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmo desconocido de compresión «%s»"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Salida comprimida %s necesita una herramienta de compresión"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "No se pudo crear FICHERO*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "No se pudo bifurcar"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Hijo compresión"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Error interno, no se pudo crear %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Falló la ES a subproceso/archivo"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "No se pudo leer mientras se computaba MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Se produjo un problema al desligar %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
+"\n"
+"apt-extracttemplates es una herramienta para extraer información de\n"
+"configuración y plantillas de paquetes de debian.\n"
+"\n"
+"Opciones:\n"
+"  -h   Este texto de ayuda.\n"
+"  -t   Define el directorio temporal\n"
+"  -c=? Lee este archivo de configuración\n"
+"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
+"cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "¡Registro de paquete desconocido!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Uso: apt-sortpkgs [opciones] archivo1 [archivo2 ...]\n"
+"\n"
+"apt-sortpkgs es una herramienta sencilla para ordenar archivos de paquetes.\n"
+"La opción -s se utiliza para indicar qué tipo de archivo es.\n"
+"\n"
+"Opciones:\n"
+"  -h   Este texto de ayuda.\n"
+"  -s   Utiliza ordenamiento de archivos fuente\n"
+"  -c=? Lee este archivo de configuración\n"
+"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
+"cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s no es un paquete DEB válido."
 
diff --git a/po/eu.po b/po/eu.po
index 48efb2b53..f14fc79cb 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_eu\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -18,156 +18,157 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Pakete Izenak Guztira : "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Pakete Izenak Guztira : "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Pakete normalak:"
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Pakete birtual puruak:"
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Bakanako pakete birtualak: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Nahastutako pakete birtualak: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Falta direnak: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Bertsio Ezberdinak Guztira: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Azalpen Ezberdinak Guztira: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Dependentziak Guztira: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Guztira Bertsio/fitxategi erlazioak: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Fitx/Azalpen erlazioak guztira: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Guztira Saltzaile Mapatzea: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Guztira bateratutako kateak: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Guztira bertsio dependentzia lekua: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Guztira galdutako tokia:"
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Guztira erregistratutako lekua: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "%s pakete fitxategia ez dago sinkronizatuta."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Ez da paketerik aurkitu"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Zehazki eredu bat eman behar duzu."
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ezin da %s paketea lokalizatu"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Pakete Fitxategiak:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Pin duten Paketeak:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(ez da aurkitu)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Instalatuta: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Hautagaia: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Paketearen pin-a:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Bertsio taula:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -239,30 +240,30 @@ msgstr ""
 "  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
 "Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Mesedez sar diska bat gailuan eta enter sakatu"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu."
 
@@ -298,65 +299,65 @@ msgstr ""
 "  -c=? Irakurri konfigurazio fitxategi hau\n"
 "  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Ezin da deskarga direktorioa blokeatu"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
@@ -376,97 +377,97 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ezin da %s(e)n duzun leku librea atzeman."
 
-#: cmdline/apt-get.cc:877
+#: 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."
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Eskuratu %s iturburua\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Huts egin du zenbat artxibo lortzean."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Deskarga amaituta eta deskarga soileko moduan"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Prozesu umeak huts egin du"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s: ez du eraikitze mendekotasunik.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -474,7 +475,7 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -482,14 +483,14 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -498,7 +499,7 @@ 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:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -506,30 +507,30 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, 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:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Konektatzen -> %s.(%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -616,53 +617,74 @@ msgstr ""
 "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
 "                       APT honek Super Behiaren Ahalmenak ditu.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "baina ez dago instalatuta"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s bertsiorik berriena da jada.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s bertsiorik berriena da jada.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s espero zen baina ez zegoen han"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Huts egin du %s irekitzean"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -689,7 +711,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -738,52 +760,52 @@ msgstr ""
 msgid "Disk not found."
 msgstr "Ez da diska aurkitu"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Ez da fitxategia aurkitu"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Huts egin du atzitzean"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Huts egin du aldaketa ordua ezartzean"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI baliogabea. URI lokalek ezin dute // eduki hasieran"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Sartzen"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Ezin izan da peer edo parekoaren izena zehaztu"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Ezin izan da izen lokala zehaztu"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Zerbitzariak gure konexioa ukatu eta hau esan du: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USERek huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASSek huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -791,124 +813,126 @@ msgstr ""
 "Proxy zerbitzari bat zehaztu da, baina sarrerako script-ik ez. Acquire::ftp::"
 "ProxyLogin hutsik dago."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Sarrerako script-eko '%s' komandoak huts egin du, eta zerbitzariak hau esan "
 "du: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Konexioa denboraz kanpo"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Zerbitzariak konexioa itxi du"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Irakurketa errorea"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Erantzun batek bufferrari gainez eragin dio."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Protokolo hondatzea"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Idazketa errorea"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Ezin izan da socket-a sortu"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Huts egin du"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Ezin izan da socket pasibora konektatu."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo-k ezin izan du socket entzule bat eskuratu"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Ezin izan da socket bat lotu"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Ezin izan da socket-ean entzun"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Ezin izan da socket-aren izena zehaztu"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Ezin da PORT komandoa bidali"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Helbide familia ezezagunaa: %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Datu-socket konexioak denbora muga gainditu du"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Arazoa fitxategiaren hash egitean"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Datu-socketak denbora muga gainditu du"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Datu transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Kontsulta"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Ezin da deitu "
 
@@ -945,7 +969,7 @@ msgstr "Ezin izan da konektatu -> %s:%s (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Konektatzen -> %s..."
@@ -975,37 +999,37 @@ 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:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Beintza sinadura baliogabe bat aurkitu da."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Errore ezezaguna gpgv exekutatzean"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Ondorengo sinadurak baliogabeak dira:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1013,148 +1037,382 @@ msgstr ""
 "Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago "
 "eskuragarri:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Hautapenak huts egin du"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Konexioaren denbora muga gainditu da"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Goiburuen zain"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Okerreko goiburu-lerroa"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du."
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "http zerbitzariak barruti onarpena apurturik du"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Datu formatu ezezaguna"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Barne errorea"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Berriketak kalkulatzen... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Eginda"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Mendekotasunak zuzentzen..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " : huts egin du."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ezin dira mendekotasunak zuzendu"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Eginda"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "baina %s instalatuta dago"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "baina %s instalatzeko dago"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "baina ez da instalagarria"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "baina pakete birtuala da"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "baina ez dago instalatuta"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "baina ez da instalatuko"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " edo"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Ondorengo paketeak KENDUKO dira:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Ondorengo paketeak mantendu egin dira:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Ondorengo paketeak bertsio-berrituko dira:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (arrazoia: %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
+"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu berrinstalatuta, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu aurreko bertsiora itzulita, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ez erabat instalatuta edo kenduta.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[B/e]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[b/E]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Adierazpen erregularren konpilazio errorea - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Barne errorea, ez da ordenatzeaz amaitu"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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 "
+"Hau bitxia... Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra "
 "berri emanez (ingelesez)"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Artxiboetako %sB eskuratu behar dira.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Ez daukazu nahikoa leku libre %s(e)n."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Bai, egin esandakoa!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1165,19 +1423,19 @@ msgstr ""
 "Jarraitzeko, idatzi '%s' esaldia\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Abortatu."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Aurrera jarraitu nahi al duzu?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Fitxategi batzuk ezin izan dira deskargatu"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1185,19 +1443,19 @@ msgstr ""
 "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo "
 "--fix-missing aukerarekin saiatu?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Falta diren paketeak ezin dira zuzendu."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Abortatu instalazioa."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1207,15 +1465,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1233,15 +1491,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Informazio honek arazoa konpontzen lagun dezake:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1255,7 +1513,7 @@ msgstr[1] ""
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1267,18 +1525,18 @@ msgstr[1] ""
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "'apt-get autoremove' erabili ezabatzeko."
 msgstr[1] "'apt-get autoremove' erabili ezabatzeko."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1286,7 +1544,7 @@ msgstr ""
 "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
 "zehaztu konponbide bat)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1298,318 +1556,92 @@ msgstr ""
 "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
 "Sarrerakoetan (Incoming) egoten jarraituko dute."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Hautsitako paketeak"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Iradokitako paketeak:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Gomendatutako paketeak:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Egiaztapen abisua gainidazten.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Zenbait pakete ezin dira egiaztatu"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Paketeak egiaztapen gabe instalatu?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ezin da lortu %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "baina %s instalatuta dago"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "baina %s instalatzeko dago"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "baina ez da instalagarria"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "baina pakete birtuala da"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "baina ez dago instalatuta"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "baina ez da instalatuko"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " edo"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Ondorengo paketeak KENDUKO dira:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Ondorengo paketeak mantendu egin dira:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Ondorengo paketeak bertsio-berrituko dira:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (arrazoia: %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
-"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu berrinstalatuta, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu aurreko bertsiora itzulita, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ez erabat instalatuta edo kenduta.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[B/e]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[b/E]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Adierazpen erregularren konpilazio errorea - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Mendekotasunak zuzentzen..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " : huts egin du."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Ezin dira mendekotasunak zuzendu"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Eginda"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Berriketak kalkulatzen... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Eginda"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Atzituta "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Hartu:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ez ikusi "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Lortuta: %sB (%s) (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Lanean]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1622,19 +1654,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ezin da %s irakurri"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ezin da %s(e)ra aldatu"
@@ -1663,11 +1695,11 @@ msgstr "%s fitxategia ezin izan da ireki"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Konexioa behar baino lehenago itxi da"
 
@@ -1709,1347 +1741,474 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Eskuragarrien datuak biltzen"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
-"\n"
-"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n"
-"informazioa ateratzeko tresna bat da\n"
-"\n"
-"Aukerak:\n"
-"  -h   Laguntza testu hau\n"
-"  -t   Ezarri aldi baterako direktorioa\n"
-"  -c=? Irakurri konfigurazio fitxategi hau\n"
-"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s : ezin da idatzi"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Pakete luzapenen zerrenda luzeegia da"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Errorea direktorioa prozesatzean %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Iturburu luzapenen zerrenda luzeegia da"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Errorea eduki fitxategiaren goiburua idaztean"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Errorea edukiak prozesatzean %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Erabilera: apt-ftparchive [aukerak] komandoa\n"
-"Komandoak: 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 Debian artxiboen indizeak sortzeko erabiltzen da. Sortzeko \n"
-"estilo asko onartzen ditu, erabat automatizatuak nahiz ordezte funtzionalak\n"
-"'dpkg-scanpackages' eta 'dpkg-scansources'erako\n"
-"Package izeneko fitxategiak sortzen ditu .deb fitxategien zuhaitz batetik.\n"
-"Package fitxategiak pakete bakoitzaren kontrol eremu guztiak izaten ditu,\n"
-"MD5 hash balioa eta fitxategi tamaina barne. Override fitxategia erabiltzen\n"
-"da lehentasunaren eta sekzioaren balioak behartzeko.\n"
-"\n"
-"Era berean, iturburu fitxategiak ere sortzen ditu .dsc fitxategien\n"
-"zuhaitzetik. --source-override aukera erabil daiteke src override \n"
-"fitxategi bat zehazteko.\n"
-"'packages' eta 'sources' komandoa zuhaitzaren erroan exekutatu behar dira.\n"
-"BinaryPath-ek bilaketa errekurtsiboaren oinarria seinalatu behar du, eta\n"
-"override fitxategiak override banderak izan behar ditu. Pathprefix \n"
-"fitxategi izenen eremuei eransten zaie (halakorik badago). Hona hemen\n"
-"Debian artxiboko erabilera argibide bat:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Aukerak:\n"
-"  -h    Laguntza testu hau\n"
-"  --md5 Kontrolatu MD5 sortzea\n"
-"  -s=?  Iturburuaren override fitxategia\n"
-"  -q    Isilik\n"
-"  -d=?  Hautatu aukerako katxearen datu-basea\n"
-"  --no-delink Gaitu delink arazketa modua\n"
-"  --contents  Kontrolatu eduki fitxategia sortzea\n"
-"  -c=?  Irakurri konfigurazio fitxategi hau\n"
-"  -o=?  Ezarri konfigurazio aukera arbitrario bat"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Ez dago bat datorren hautapenik"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da"
-
-#: ftparchive/cachedb.cc:76
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, "
-"mesedez datubasea ezabatu eta birsortu."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ezin da ireki %s datu-base fitxategia: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Huts egin du %s(e)tik datuak lortzean"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Artxiboak ez du kontrol erregistrorik"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Ezin da kurtsorerik eskuratu"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Ezin da %s direktorioa irakurri\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: Ezin da %s atzitu\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "A: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Erroreak fitxategiari dagozkio "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Huts egin du %s ebaztean"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Huts egin dute zuhaitz-urratsek"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Huts egin du %s irekitzean"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Huts egin du %s esteka irakurtzean"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Huts egin du %s desestekatzean"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-en mugara (%sB) heldu da.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Artxiboak ez du pakete eremurik"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s: ez du override sarrerarik\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s mantentzailea %s da, eta ez %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s: ez du jatorri gainidazketa sarrerarik\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s: ez du bitar gainidazketa sarrerarik\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Huts egin du memoria esleitzean"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Ezin da %s ireki"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Huts egin du %s override fitxategia irakurtzean"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Gaizki osatutako override %s, lerroa: %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Gaizki osatutako override %s, lerroa: %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' Konpresio Algoritmo Ezezaguna"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "%s irteera konprimituak konpresio-tresna bat behar du"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Huts egin du FILE* sortzean"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Huts egin du sardetzean"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Konprimatu Umeak"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Barne Errorea, Huts %s sortzerakoan"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Huts egin du MD5 konputatzean"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Arazoa %s desestekatzean"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Huts egin du %s izenaren ordez %s ipintzean"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
-"\n"
-"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n"
-"informazioa ateratzeko tresna bat da\n"
-"\n"
-"Aukerak:\n"
-"  -h   Laguntza testu hau\n"
-"  -t   Ezarri aldi baterako direktorioa\n"
-"  -c=? Irakurri konfigurazio fitxategi hau\n"
-"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Pakete erregistro ezezaguna!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Erabilera: apt-sortpkgs [aukerak] fitxategia1 [fitxategia2...]\n"
-"\n"
-"apt-sortpkgs pakete fitxategiak ordenatzeko tresna soil bat da. Zein\n"
-"motatako fitxategia den adierazteko -s aukera erabiltzen da.\n"
-"\n"
-"Aukerak:\n"
-"  -h   Laguntza testu hau\n"
-"  -s   Erabili iturburu fitxategien ordenatzea\n"
-"  -c=? Irakurri konfigurazio fitxategi hau\n"
-"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Huts egin du kanalizazioak sortzean"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Huts egin du gzip exekutatzean "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Hondatutako artxiboa"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "%u TAR goiburu mota ezezaguna, %s kidea"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Artxibo sinadura baliogabea"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Errorea artxiboko kidearen goiburua irakurtzean"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Artxiboko kidearen goiburua baliogabea da"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Artxiboko kidearen goiburua baliogabea da"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Artxiboa laburregia da"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Huts egin artxibo goiburuak irakurtzean"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Huts egin du hash-elementua lokalizatzean!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Huts egin du desbideratzea lokalizatzean"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "AddDiversion-n barne errorea"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Desbideratze bat gainidazten saiatzen: %s -> %s eta %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Desbideratzearen gehitze bikoitza: %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Konfigurazio fitxategi bikoiztua: %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Ezin izan da %s fitxategian idatzi"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Ezin izan da %s fitxategia itxi"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "%s bidea luzeegia da"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s behin baino gehiagotan deskonprimitzen"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "%s direktorioa desbideratuta dago"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Desbideratzearen bidea luzeegia da"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Huts egin du %s(e)tik datuak lortzean"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Huts egin du %s izenaren ordez %s ipintzean"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "%s direktorioa ez-direktorio batekin ordezten ari da"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Bidea luzeegia da"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Ezin da daturik lortu %s(e)tik"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Ezin izan da %s fitxategian idatzi"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Ezin izan da %s fitxategia itxi"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Barne Errorea, ezin da %s atala kokatu"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Kontrol fitxategi ezin analizagarria"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Ezin da fitxategi huts baten mmap egin"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Artxibo sinadura baliogabea"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Errorea artxiboko kidearen goiburua irakurtzean"
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Ezin izan da %lu byteren mmap egin"
+msgid "Invalid archive member header %s"
+msgstr "Artxiboko kidearen goiburua baliogabea da"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Ezin da %s ireki"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Artxiboko kidearen goiburua baliogabea da"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Ezin da deitu "
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Artxiboa laburregia da"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Ezin izan da %lu byteren mmap egin"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Huts egin artxibo goiburuak irakurtzean"
 
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Huts fitxategia mozterakoan"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Huts egin du kanalizazioak sortzean"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Start muga. Uneko "
-"balioa: %lu. (man 5 apt.conf)"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Huts egin du gzip exekutatzean "
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Hondatutako artxiboa"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "%u TAR goiburu mota ezezaguna, %s kidea"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "Ezin da %s atzitu."
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%limin %lis"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s hautapena ez da aurkitu"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Mota ezezaguneko laburtzapena: '%c'"
-
-#: apt-pkg/contrib/configuration.cc:617
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "%s konfigurazio fitxategia irekitzen"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, 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:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Sintaxi errorea %s:%u: Gaizki eratutako"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, 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:861
-#, 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:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Sintaxi errorea, %s:%u: habiaratutako elementu gehiegi"
+msgid "Packaging system '%s' is not supported"
+msgstr "'%s' pakete sistema ez da onartzen"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Ezin da pakete sistemaren mota egokirik zehaztu"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke"
+msgid "Wrote %i records.\n"
+msgstr "%i erregistro grabaturik.\n"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Errorea!"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Eginda"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
+"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik\n"
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Eginda"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Ez da ezagutzen komando lerroko '%c' aukera [%s]."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Ez da ulertzen komando lerroko %s aukera"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Komando lerroko %s aukera ez da boolearra."
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "%s aukerak argumentu bat behar du."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "Can't find authentication record for: %s"
 msgstr ""
-"%s aukera: konfigurazio elementuaren zehaztapenak =<val> eduki behar du."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "%s aukerak osoko argumentu bat behar du, eta ez '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "'%s' aukera luzeegia da"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "%s zentzua ez da ulertzen; probatu egiazkoa edo faltsua."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Eragiketa baliogabea: %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Ezin da atzitu %s muntatze puntua"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Huts egin du CDROMa atzitzean"
-
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Arazoa fitxategia ixtean"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-"Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo "
-"fitxategiarentzat"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Ezin izan da %s blokeo fitxategia ireki"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Ezin izan da %s blokeoa hartu"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgid "Hash mismatch for: %s"
+msgstr "Egiaztapena ez dator bat"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
+msgid "The method driver %s could not be found."
+msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)"
+msgid "Is the package %s installed?"
+msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "%s azpiprozesua ustekabean amaitu da"
+msgid "Method %s did not start correctly"
+msgstr "%s metodoa ez da behar bezala abiarazi"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Could not open file %s"
-msgstr "%s fitxategia ezin izan da ireki"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Huts egin du IPC azpiprozesua sortzean"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Huts egin du konpresorea exekutatzean "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "idatzita; oraindik %lu idazteke, baina ezin da"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Arazoa fitxategia ixtean"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Arazoa fitxategia sinkronizatzean"
+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/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Arazoa fitxategia desestekatzean"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Arazoa fitxategia sinkronizatzean"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abortatu instalazioa."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Ezin izan da Iturburu zerrenda irakurri."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Paketeen katxea hutsik"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Paketeen katxe fitxategia hondatuta dago"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Paketeen katxe fixategiaren bertsioa ez da bateragarria"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Paketeen katxe fitxategia hondatuta dago"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Mendekotasuna:"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Aurremendekotasuna:"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Iradokizuna:"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Gomendioa:"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Gatazka:"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Ordeztea:"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Zaharkitzea:"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Apurturik"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "garrantzitsua"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "beharrezkoa"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "estandarra"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "aukerakoa"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "estra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Dependentzia zuhaitza eraikitzen"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Hautagaien bertsioak"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Dependentzi Sormena"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Egoera argibideak irakurtzen"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ezin da %s pakete fitxategia analizatu (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "%s irekitzen"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "%s fitxategia ezin izan da ireki"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Instalazio hau exekutatzeko, funtsezko %s paketea aldi baterako kendu behar "
-"da, Gatazka/Aurre-mendekotasun begizta baten ondorioz. Normalean arriskutsua "
-"izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak "
-"aukera."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "'%s' motako indize fitxategirik ez da onartzen"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
-"atxikitako paketeek eraginda."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "%spartial zerrenda-direktorioa falta da."
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "%spartial artxibo direktorioa falta da."
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Ezin da zerrenda direktorioa blokeatu"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "%li fitxategia jasotzen %li-tik"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s metodoa ez da behar bezala abiarazi"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "'%s' pakete sistema ez da onartzen"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Ezin da pakete sistemaren mota egokirik zehaztu"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ezin da %s atzitu."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Ezin izan da Iturburu zerrenda irakurri."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Ez da ulertu %s orratz-mota (pin)"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Katxearen bertsio sistema ez da bateragarria"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "APT honek maneia dezakeen pakete izenen kopurua gainditu duzu."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "APT honek maneia dezakeen bertsio kopurua gainditu duzu."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Pakete Zerrenda irakurtzen"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Fitxategiaren erreferentziak biltzen"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s : ezin da idatzi"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "S/I errorea iturburu katxea gordetzean"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Egiaztapena ez dator bat"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Tamaina ez dator bat"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Eragiketa baliogabea: %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3057,12 +2216,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3071,12 +2230,12 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea. (arkitektura falta delako)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3084,71 +2243,132 @@ msgstr ""
 "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "%s saltzaile blokeak ez du egiaztapen markarik"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ezin da %s pakete fitxategia analizatu (1)"
+msgid "List directory %spartial is missing."
+msgstr "%spartial zerrenda-direktorioa falta da."
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
+msgid "Archives directory %spartial is missing."
+msgstr "%spartial artxibo direktorioa falta da."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Ezin da zerrenda direktorioa blokeatu"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
+
+#: apt-pkg/acquire.cc:901
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "%li fitxategia jasotzen %li-tik"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
+"zaharrak erabili dira haien ordez."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Lerro baliogabea desbideratze fitxategian: %s"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Ez da ulertu %s orratz-mota (pin)"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ezin da %s pakete fitxategia analizatu (1)"
+msgid "Could not configure '%s'. "
+msgstr "%s fitxategia ezin izan da ireki"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "%s saltzaile blokeak ez du egiaztapen markarik"
+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 ""
+"Instalazio hau exekutatzeko, funtsezko %s paketea aldi baterako kendu behar "
+"da, Gatazka/Aurre-mendekotasun begizta baten ondorioz. Normalean arriskutsua "
+"izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak "
+"aukera."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM Desmuntatzen...\n"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "%s CD-ROM muntatze puntua erabiltzen\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "CD-ROM-a desmuntatzen\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Diska itxaroten...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "CD-ROM-a muntatzen...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Egiaztatzen... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Gordetako Etiketa: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM Desmuntatzen...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Indize fitxategien bila diska arakatzen...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3157,22 +2377,22 @@ msgstr ""
 "%zu pakete indize, %zu jatorri indize %zu itzulpen indize eta %zu sinadura "
 "aurkitu dira\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Aurkitutako Etiketa: '%s' \n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Hau ez baliozko izen bat, froga berriro.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3181,303 +2401,1116 @@ msgstr ""
 "Diskaren izen:\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Pakete zerrendak kopiatzen..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Jatorri zerrenda berria idazten\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Diskoarentzako jatorri sarrerak:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i erregistro grabaturik.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
+"atxikitako paketeek eraginda."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Dependentzia zuhaitza eraikitzen"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Hautagaien bertsioak"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependentzi Sormena"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Egoera argibideak irakurtzen"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n"
+msgid "Failed to open StateFile %s"
+msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+msgid "Unable to parse package file %s (1)"
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Egiaztapena ez dator bat"
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Ezin da %s pakete fitxategia analizatu (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Ezin izan da %s zeregina aurkitu"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Lerro baliogabea desbideratze fitxategian: %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
+
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
-"zaharrak erabili dira haien ordez."
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s irekitzen"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "%s Instalatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "%s konfiguratzen"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "%s kentzen"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s guztiz ezabatu da"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' direktorioa falta da"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "%s prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s irekitzen"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfiguratzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s Instalatuta"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s kentzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s kendurik"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s guztiz ezabatzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s guztiz ezabatu da"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "%s : ezin da idatzi"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Ezin da zerrenda direktorioa blokeatu"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s hautapena ez da aurkitu"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+"Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo "
+"fitxategiarentzat"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Ezin izan da %s blokeo fitxategia ireki"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Ezin izan da %s blokeoa hartu"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "%s azpiprozesua ustekabean amaitu da"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Arazoa fitxategia ixtean"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "%s fitxategia ezin izan da ireki"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Huts egin du IPC azpiprozesua sortzean"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Huts egin du konpresorea exekutatzean "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "idatzita; oraindik %lu idazteke, baina ezin da"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Arazoa fitxategia ixtean"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Arazoa fitxategia sinkronizatzean"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Arazoa fitxategia desestekatzean"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Arazoa fitxategia sinkronizatzean"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Errorea!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Eginda"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Eginda"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Ezin da fitxategi huts baten mmap egin"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Ezin izan da %lu byteren mmap egin"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Ezin da %s ireki"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Ezin da deitu "
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Ezin izan da %lu byteren mmap egin"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Huts fitxategia mozterakoan"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Start muga. Uneko "
+"balioa: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Ezin da atzitu %s muntatze puntua"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Huts egin du CDROMa atzitzean"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Mota ezezaguneko laburtzapena: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "%s konfigurazio fitxategia irekitzen"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Sintaxi errorea %s:%u: Gaizki eratutako"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Sintaxi errorea, %s:%u: habiaratutako elementu gehiegi"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortatu instalazioa."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Ez da ezagutzen komando lerroko '%c' aukera [%s]."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Ez da ulertzen komando lerroko %s aukera"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Komando lerroko %s aukera ez da boolearra."
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "%s aukerak argumentu bat behar du."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"%s aukera: konfigurazio elementuaren zehaztapenak =<val> eduki behar du."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "%s aukerak osoko argumentu bat behar du, eta ez '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "'%s' aukera luzeegia da"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "%s zentzua ez da ulertzen; probatu egiazkoa edo faltsua."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Eragiketa baliogabea: %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
+"\n"
+"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n"
+"informazioa ateratzeko tresna bat da\n"
+"\n"
+"Aukerak:\n"
+"  -h   Laguntza testu hau\n"
+"  -t   Ezarri aldi baterako direktorioa\n"
+"  -c=? Irakurri konfigurazio fitxategi hau\n"
+"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ezin da daturik lortu %s(e)tik"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Pakete luzapenen zerrenda luzeegia da"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Errorea direktorioa prozesatzean %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Iturburu luzapenen zerrenda luzeegia da"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Errorea eduki fitxategiaren goiburua idaztean"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Errorea edukiak prozesatzean %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Erabilera: apt-ftparchive [aukerak] komandoa\n"
+"Komandoak: 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 Debian artxiboen indizeak sortzeko erabiltzen da. Sortzeko \n"
+"estilo asko onartzen ditu, erabat automatizatuak nahiz ordezte funtzionalak\n"
+"'dpkg-scanpackages' eta 'dpkg-scansources'erako\n"
+"Package izeneko fitxategiak sortzen ditu .deb fitxategien zuhaitz batetik.\n"
+"Package fitxategiak pakete bakoitzaren kontrol eremu guztiak izaten ditu,\n"
+"MD5 hash balioa eta fitxategi tamaina barne. Override fitxategia erabiltzen\n"
+"da lehentasunaren eta sekzioaren balioak behartzeko.\n"
+"\n"
+"Era berean, iturburu fitxategiak ere sortzen ditu .dsc fitxategien\n"
+"zuhaitzetik. --source-override aukera erabil daiteke src override \n"
+"fitxategi bat zehazteko.\n"
+"'packages' eta 'sources' komandoa zuhaitzaren erroan exekutatu behar dira.\n"
+"BinaryPath-ek bilaketa errekurtsiboaren oinarria seinalatu behar du, eta\n"
+"override fitxategiak override banderak izan behar ditu. Pathprefix \n"
+"fitxategi izenen eremuei eransten zaie (halakorik badago). Hona hemen\n"
+"Debian artxiboko erabilera argibide bat:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Aukerak:\n"
+"  -h    Laguntza testu hau\n"
+"  --md5 Kontrolatu MD5 sortzea\n"
+"  -s=?  Iturburuaren override fitxategia\n"
+"  -q    Isilik\n"
+"  -d=?  Hautatu aukerako katxearen datu-basea\n"
+"  --no-delink Gaitu delink arazketa modua\n"
+"  --contents  Kontrolatu eduki fitxategia sortzea\n"
+"  -c=?  Irakurri konfigurazio fitxategi hau\n"
+"  -o=?  Ezarri konfigurazio aukera arbitrario bat"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Ez dago bat datorren hautapenik"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da"
+
+#: ftparchive/cachedb.cc:80
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, "
+"mesedez datubasea ezabatu eta birsortu."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ezin da ireki %s datu-base fitxategia: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Artxiboak ez du kontrol erregistrorik"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Ezin da kurtsorerik eskuratu"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Ezin da %s direktorioa irakurri\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "A: Ezin da %s atzitu\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "A: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Erroreak fitxategiari dagozkio "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Huts egin du %s ebaztean"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Huts egin dute zuhaitz-urratsek"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Huts egin du %s irekitzean"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Huts egin du %s esteka irakurtzean"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Huts egin du %s desestekatzean"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink-en mugara (%sB) heldu da.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Artxiboak ez du pakete eremurik"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s: ez du override sarrerarik\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s mantentzailea %s da, eta ez %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s: ez du jatorri gainidazketa sarrerarik\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s: ez du bitar gainidazketa sarrerarik\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Huts egin du memoria esleitzean"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ezin da %s ireki"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Huts egin du %s override fitxategia irakurtzean"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Gaizki osatutako override %s, lerroa: %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Gaizki osatutako override %s, lerroa: %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "'%s' Konpresio Algoritmo Ezezaguna"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "%s irteera konprimituak konpresio-tresna bat behar du"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Huts egin du FILE* sortzean"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Huts egin du sardetzean"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Konprimatu Umeak"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Barne Errorea, Huts %s sortzerakoan"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Huts egin du MD5 konputatzean"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Arazoa %s desestekatzean"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
+"\n"
+"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n"
+"informazioa ateratzeko tresna bat da\n"
+"\n"
+"Aukerak:\n"
+"  -h   Laguntza testu hau\n"
+"  -t   Ezarri aldi baterako direktorioa\n"
+"  -c=? Irakurri konfigurazio fitxategi hau\n"
+"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Pakete erregistro ezezaguna!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Erabilera: apt-sortpkgs [aukerak] fitxategia1 [fitxategia2...]\n"
+"\n"
+"apt-sortpkgs pakete fitxategiak ordenatzeko tresna soil bat da. Zein\n"
+"motatako fitxategia den adierazteko -s aukera erabiltzen da.\n"
+"\n"
+"Aukerak:\n"
+"  -h   Laguntza testu hau\n"
+"  -s   Erabili iturburu fitxategien ordenatzea\n"
+"  -c=? Irakurri konfigurazio fitxategi hau\n"
+"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s ez da baliozko DEB pakete bat."
 
diff --git a/po/fi.po b/po/fi.po
index b12d26f5c..9b90aad05 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -18,154 +18,155 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Pakettien kokonaismäärä : "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Pakettien kokonaismäärä : "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Tavallisia paketteja: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Aitoja näennäispaketteja: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Yksinkertaisia näennäispaketteja: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Sekanäennäispaketteja: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Puuttuu: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Eri versioita yhteensä: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Eri kuvauksia yhteensä: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Riippuvuuksia yhteensä: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Versio/tdsto suhteita yht: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Kuvaus/tdsto suhteita yht: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Tarjoamiskuvauksia yhteensä: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Erilaisia merkkijonoja yhteensä: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Versioriippuvuustila yhteensä: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Löysää tilaa yhteensä: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Käytetty tila yhteensä: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakettitiedosto %s ei ole ajan tasalla."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Yhtään pakettia ei löytynyt"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "On annettava täsmälleen yksi lauseke"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Pakettia %s ei löydy"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Pakettitiedostot:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei löydy kansiosta"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Paketit joissa tunniste:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(ei löydy)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Asennettu: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Ehdokas: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(ei mitään)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Paketin tunnistenumero: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Versiotaulukko:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -237,29 +238,29 @@ msgstr ""
 "  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 "Lisätietoja apt-cache(8) ja apt.conf(5) käsikirjasivuilla.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Kirjoita levylle nimi, kuten \"Debian 2.1r1 Levy 1\""
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Aseta levy asemaan ja paina Enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Toista tämä lopuille rompuille kasassasi."
 
@@ -295,65 +296,65 @@ msgstr ""
 "  -c=? Lue tämä asetustiedosto\n"
 "  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Pakettia %s ei löytynyt"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Pakettia %s ei löytynyt"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Pakettia %s ei löytynyt"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "stat ei toiminut lähdepakettiluettelolle %s"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Pakettia %s ei löytynyt"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Sisäinen virhe, resolver rikkoi jotain"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Noutokansiota ei saatu lukittua"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
@@ -373,96 +374,96 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
 
-#: cmdline/apt-get.cc:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "On noudettava %st lähdekoodiarkistoja.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Nouda lähdekoodi %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Nouto on valmis ja määrätty vain nouto"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Purkukomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Lapsiprosessi kaatui"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -470,7 +471,7 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -478,14 +479,14 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -494,7 +495,7 @@ msgstr ""
 "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
 "ei vastaa versioriippuvuuksia"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -502,30 +503,30 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Avataan yhteys %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -611,53 +612,74 @@ msgstr ""
 "lisätietoja ja lisää valitsimia.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "mutta ei ole asennettu"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s on jo uusin versio.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s on jo uusin versio.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Odotettiin %s, mutta sitä ei ollut"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Tiedoston %s avaaminen ei onnistunut"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -684,7 +706,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -732,52 +754,52 @@ msgstr "Rompun %s irrottaminen ei onnistu, se on ehkä käytössä."
 msgid "Disk not found."
 msgstr "Levyä ei löydy"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Tiedostoa ei löydy"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Komento stat ei toiminut"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI on kelvoton, paikallinen URI ei saa alkaa //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Kirjaudutaan sisään"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Vastapään nimeä ei saa selville"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Paikallista nimeä ei saa selville"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Palvelin ei huolinut yhteyttä ilmoituksella: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER ei onnistunut, palvelimen ilmoitus: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS ei onnistunut, palvelimen ilmoitus: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -785,121 +807,123 @@ msgstr ""
 "Määritettiin välipalvelin mutta ei komentotiedostoa kirjautumiseen, Acquire::"
 "ftp::ProxyLogin on tyhjä."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Komentotiedoston rivi \"%s\" ei toiminut, palvelin ilmoitti: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE ei toiminut, palvelin ilmoitti: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Yhteys aikakatkaistiin"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Palvelin sulki yhteyden"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Lukuvirhe"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Vastaus aiheutti puskurin ylivuodon."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Yhteyskäytäntö on turmeltunut"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Virhe kirjoitettaessa"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Pistoketta ei voitu luoda"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Ei onnistunut"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Passiivista pistoketta ei voitu kytkeä."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ei saanut kuuntelupistoketta"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Pistoketta ei voitu nimetä"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Pistoketta ei voitu kuunnella"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Pistokkeen nimeä ei saatu selville"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Komennon PORT lähetys ei onnistu"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Tuntematon osoiteperhe %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ei onnistunut, palvelin ilmoitti: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Pistokkeen kytkeminen aikakatkaistiin"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Yhteyttä ei voitu hyväksyä"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Tiedostoa ei saatu noudettua, palvelin ilmoitti \"%s\""
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Pistoke aikakatkaistiin"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\""
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Kysely"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Käynnistys ei onnistu"
 
@@ -935,7 +959,7 @@ msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Avataan yhteys %s"
@@ -965,39 +989,39 @@ 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:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1005,148 +1029,382 @@ msgstr ""
 "Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole "
 "saatavilla:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Select ei toiminut"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Yhteys aikakatkaistiin"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Odotetaan otsikoita"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Virheellinen otsikkorivi"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "HTTP-palvelimen arvoaluetuki on rikki"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Tuntematon päiväysmuoto"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Käsitellään päivitystä ... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Valmis"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Korjataan riippuvuuksia..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ei onnistunut."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Riippuvuuksien korjaus ei onnistu"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Päivitysjoukon minimointi ei onnistu"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Valmis"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "mutta %s on asennettu"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mutta %s on merkitty asennettavaksi"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "mutta ei ole asennuskelpoinen"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "mutta on näennäispaketti"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "mutta ei ole asennettu"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "mutta ei ole merkitty asennettavaksi"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " tai"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Seuraavat UUDET paketit asennetaan:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Seuraavat paketit POISTETAAN:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Nämä paketit on jätetty odottamaan:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Nämä paketit päivitetään:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Nämä paketit VARHENNETAAN:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Seuraavat pysytetyt paketit muutetaan:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (syynä %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n"
+"Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu päivitetty, %lu uutta asennusta, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu uudelleen asennettua, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu varhennettua, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[K/e]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "K"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Käännösvirhe lausekkeessa - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Komento update ei käytä parametreja"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Noudettavaa arkistoa %st/%st.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Noudettavaa arkistoa %st.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 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."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Kyllä, tee kuten käsketään!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1157,19 +1415,19 @@ msgstr ""
 "Jatka kirjoittamalla \"%s\"\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Keskeytä."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Haluatko jatkaa?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Joidenkin tiedostojen nouto ei onnistunut"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1177,19 +1435,19 @@ msgstr ""
 "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai "
 "kokeile --fix-missing?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Puuttuvia paketteja ei voi korjata."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Asennus keskeytetään."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1199,16 +1457,16 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 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ää"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1226,15 +1484,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1248,7 +1506,7 @@ msgstr[1] ""
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1260,18 +1518,18 @@ msgstr[1] ""
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Poista ne komennolla \"apt-get autoremove\"."
 msgstr[1] "Poista ne komennolla \"apt-get autoremove\"."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1279,7 +1537,7 @@ msgstr ""
 "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
 "ilmanpaketteja (tai ratkaise itse)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1290,318 +1548,92 @@ msgstr ""
 "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
 "vielä luotu tai siirretty Incoming-kansiosta."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Rikkinäiset paketit"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Ehdotetut paketit:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Suositellut paketit:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Varoitus varmistamisesta on ohitettu.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Asennetaanko nämä paketit ilman todennusta?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Tiedoston %s nouto ei onnistunut  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "mutta %s on asennettu"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mutta %s on merkitty asennettavaksi"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "mutta ei ole asennuskelpoinen"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "mutta on näennäispaketti"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "mutta ei ole asennettu"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "mutta ei ole merkitty asennettavaksi"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " tai"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Seuraavat UUDET paketit asennetaan:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Seuraavat paketit POISTETAAN:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Nämä paketit on jätetty odottamaan:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Nämä paketit päivitetään:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Nämä paketit VARHENNETAAN:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Seuraavat pysytetyt paketit muutetaan:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (syynä %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n"
-"Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu päivitetty, %lu uutta asennusta, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu uudelleen asennettua, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu varhennettua, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[K/e]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "K"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Käännösvirhe lausekkeessa - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Korjataan riippuvuuksia..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " ei onnistunut."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Riippuvuuksien korjaus ei onnistu"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Päivitysjoukon minimointi ei onnistu"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Valmis"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Komento update ei käytä parametreja"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Käsitellään päivitystä ... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Valmis"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Löytyi "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Nouda:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Siv "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Vrhe "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Noudettiin %st ajassa %s (%st/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Työskennellään]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1614,19 +1646,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Tiedostoa %s ei voi lukea"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kansioon %s vaihto ei onnistu"
@@ -1655,11 +1687,11 @@ msgstr "Tiedostoa %s ei voitu avata"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "IPC-putken luominen aliprosessiin ei onnistunut"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Yhteys katkesi ennenaikaisesti"
 
@@ -1702,1345 +1734,477 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Yhdistetään saatavuustiedot"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
-"\n"
-"apt-extracttemplates on työkalu asetus- ja mallitietojen \n"
-"poimintaan debian-paketeista\n"
-"\n"
-"Valitsimet:\n"
-"  -h   Tämä ohje\n"
-"  -t   Aseta väliaikaisten tiedostojen kansio\n"
-"  -c=? Lue tämä asetustiedosto\n"
-"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Paketin laajennuslista on liian pitkä"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Tapahtui virhe käsiteltäessa kansiota %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Lähteiden laajennuslista on liian pitkä"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr ""
-"Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Käyttö: apt-ftparchive [valitsimet] komento\n"
-"Komennot: packages binääripolku [poikkeustdsto [polun alku]]\n"
-"          sources lähdepolku [poikkeustdsto [polun alku]]\n"
-"          contents polku\n"
-"          release polku\n"
-"          generate asetukset [ryhmät]\n"
-"          clean asetukset\n"
-"\n"
-"apt-ftparchive tuottaa hakemistoja Debianin arkistoista. Monta "
-"tuottamistapaa\n"
-"on tuettu alkaen täysin automaattisista toiminnallisesti samoihin kuin\n"
-"dpkg-scanpackages ja dpkg-scansources.\n"
-"\n"
-"apt-ftparchive tuottaa pakettitiedostoja .deb-tiedostojen puusta.\n"
-"Pakettitiedostossa on kunkin paketin kaikkien ohjauskenttien\n"
-"sisältö sekä MD5 tiiviste ja tiedoston koko. Poikkeus-\n"
-"tiedostolla voidaan arvot Priority ja Section pakottaa halutuiksi.\n"
-"\n"
-"Samaan tapaan apt-ftparchive tuottaa lähdetiedostoja\n"
-".dscs-tiedostojen puusta. Valitsimella --source-overrride voidaan\n"
-"määrittää lähteiden poikkeustiedosto.\n"
-"\n"
-"Komennot \"packages\" ja \"sources\" olisi suoritettava puun juuressa.\n"
-"Binääripolun olisi osoitettava rekursiivisen haun alkukohtaan ja\n"
-"poikkeustiedostossa olisi oltava poikkeusilmaisimet. Polun alku\n"
-"yhdistetään tiedoston nimeen jos se on annettu. Esimerkki\n"
-"käytöstä Debianin arkiston kanssa:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Valitsimet:\n"
-"  -h    Tämä ohje\n"
-"  --md5 MD5 luonti\n"
-"  -s=?  Lähteiden poikkeustdosto\n"
-"  -q    Ei tulostusta\n"
-"  -d=?  Valinnainen välimuistitietokanta\n"
-"  --no-delink delinking-virheenjäljitys päälle\n"
-"  --contents  Sisällysluettelotiedoston luonti\n"
-"  -c=?  Lue tämä asetustiedosto\n"
-"  -o=?  Aseta mikä asetusvalitsin tahansa"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Mitkään valinnat eivät täsmänneet"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Tietokanta on vanha, yritetään päivittää %s"
-
-#: ftparchive/cachedb.cc:76
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, "
-"on tietokanta poistettava ja luotava uudelleen."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Tietokantatiedostoa %s ei saatu avattua: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Tiedostolle %s ei toimi stat"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Arkistolla ei ole ohjaustietuetta"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Kohdistinta ei saada"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Kansiota %s ei voi lukea\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Tdstolle %s ei toimi stat\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Tiedostossa virheitä "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Osoitteen %s selvitys ei onnistunut"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Puun läpikäynti ei onnistunut"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Tiedoston %s avaaminen ei onnistunut"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink %s ei onnistunut"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "unlink %s ei onnistunut"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Linkin %s -> %s luonti ei onnistunut"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLinkin yläraja %st saavutettu.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Arkistossa ei ollut pakettikenttää"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s:llä ei ole poikkeustietuetta\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s ylläpitäjä on %s eikä %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s:llä ei ole poikkeustietuetta\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s:llä ei  ole binääristäkään poikkeustietuetta\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Muistin varaaminen ei onnistunut"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Tiedoston %s avaaminen ei onnistunut"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Poikkeustiedoston %s lukeminen ei onnistunut"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Tuntematon pakkausalgoritmi \"%s\""
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "FILE* luominen ei onnistunut"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "fork ei onnistunut"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Compress-lapsiprosessi"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
-"\n"
-"apt-extracttemplates on työkalu asetus- ja mallitietojen \n"
-"poimintaan debian-paketeista\n"
-"\n"
-"Valitsimet:\n"
-"  -h   Tämä ohje\n"
-"  -t   Aseta väliaikaisten tiedostojen kansio\n"
-"  -c=? Lue tämä asetustiedosto\n"
-"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Tuntematon pakettitietue!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Käyttö: apt-sortpkgs [valitsimet] tdsto1 [tdsto2 ...]\n"
-"\n"
-"apt-sortpkgs on yksinkertainen työkalu pakettitiedostojen lajitteluun.\n"
-"Valitsimella -s ilmaistaan minkälainen tiedosto on.\n"
-"\n"
-"Valitsimet:\n"
-"  -h   Tämä ohje\n"
-"  -s   Käytä lähdetiedostolajittelua\n"
-"  -c=? Lue tämä asetustiedosto\n"
-"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Putkien luonti ei onnistunut"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "exec gzip ei onnistunut"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Arkisto on turmeltunut"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Arkiston tarkistussumma on virheellinen"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Tapahtui virhe luettaessa arkiston tiedoston otsikkoa"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Arkiston tiedoston otsikko on virheellinen"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Arkiston tiedoston otsikko on virheellinen"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arkisto on pienempi kuin pitäisi"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Arkiston otsikoiden luku ei onnistunut"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "Kutsuttiin DropNode mutta tiedostoon on vielä linkki"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Hajautusalkiota ei löytynyt!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Korvautuksen varaus ei onnistunut"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "AddDiversion: sisäinen virhe"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Yritetään kirjoittaa korvautuksen päälle, %s -> %s ja %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Korvautuksen kaksoislisäys %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Asetustiedoston kaksoiskappale %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Tiedoston %s sulkeminen ei onnistunut"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Polku %s on liian pitkä"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Purettiin %s useammin kuin kerran"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Kansio %s on korvautunut"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Paketti yrittää kirjoittaa korvautuksen kohteeseen %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Korvautuspolku on liian pitkä"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Tiedostolle %s ei toimi stat"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Kansiota %s ollaan korvaamassa muulla kuin kansiolla"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Solmua ei löytynyt sen hajautuslokerosta"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Polku on liian pitkä"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Päälle kirjoitettava paketti täsmää mutta paketille %s ei ole versiota"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Tiedostolle %s ei toimi stat"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Tiedoston %s sulkeminen ei onnistunut"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\""
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Ohjaustiedosto ei jäsenny"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Arkiston tarkistussumma on virheellinen"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Putkea %s ei voitu avata"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Tapahtui virhe luettaessa arkiston tiedoston otsikkoa"
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Ei voitu tehdä %lu tavun mmap:ia"
+msgid "Invalid archive member header %s"
+msgstr "Arkiston tiedoston otsikko on virheellinen"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Tiedoston %s avaaminen ei onnistunut"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Arkiston tiedoston otsikko on virheellinen"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Käynnistys ei onnistu"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arkisto on pienempi kuin pitäisi"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Ei voitu tehdä %lu tavun mmap:ia"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Arkiston otsikoiden luku ei onnistunut"
 
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Tiedoston typistäminen ei onnistunut"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Putkien luonti ei onnistunut"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "exec gzip ei onnistunut"
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Arkisto on turmeltunut"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "stat %s ei onnistu."
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%limin %lis"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Valintaa %s ei löydy"
-
-#: apt-pkg/contrib/configuration.cc:503
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Tuntematon tyypin lyhenne: \"%c\""
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Avataan asetustiedosto %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, 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:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, 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:861
-#, 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"
+msgid "Packaging system '%s' is not supported"
+msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä"
+msgid "Wrote %i records.\n"
+msgstr "Kirjoitettiin %i tietuetta.\n"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, 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:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Virhe!"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+"Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta "
+"tiedostoa\n"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Valmis"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Valmis"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Komentorivin valitsin \"%c\" [%s] on tuntematon."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Komentorivin valitsin %s on tuntematon"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Komentorivin valitsin %s ei ole totuusarvoinen"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Valitsin %s tarvitsee parametrin"
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Valitsin %s: Asetusarvon määrityksessä on oltava =<arvo>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Valitsin %s tarvitsee kokonaislukuparametrin, ei \"%s\""
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Valitsin \"%s\" on liian pitkä"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Arvo %s on tuntematon, yritä tosi tai epätosi."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Virheellinen toiminto %s"
+msgid "Hash mismatch for: %s"
+msgstr "Kohteen %s tarkistussumma ei täsmää"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Komento stat ei toiminut liitoskohdalle %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Komento stat ei toiminut rompulle"
+msgid "The method driver %s could not be found."
+msgstr "Menetelmän ajuria %s ei löytynyt"
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Pulmia tiedoston sulkemisessa"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Lukkotiedostoa %s ei voitu avata"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Lukkoa %s ei saada"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgid "Is the package %s installed?"
+msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgid "Method %s did not start correctly"
+msgstr "Menetelmä %s ei käynnistynyt oikein"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+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/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
+"Pakettiluettelonn tai tilatiedoston avaaminen tai jäsennys epäonnistui."
 
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Aliprosessi %s aiheutti suojausvirheen."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Aliprosessi %s aiheutti suojausvirheen."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Aliprosessi %s palautti virhekoodin (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Aliprosessi %s lopetti odottamatta"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Tiedostoa %s ei voitu avata"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Putkea %s ei voitu avata"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Pakkaajan käynnistäminen ei onnistunut"
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "read, vielä %lu lukematta mutta tiedosto loppui"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Pulmia tiedoston sulkemisessa"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Pulmia tehtäessä tiedostolle sync"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Pulmia tehtäessä tiedostolle unlink"
-
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Pulmia tehtäessä tiedostolle sync"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Asennus keskeytetään."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Pakettivarasto on tyhjä"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Pakettivarasto on turmeltunut"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Pakettivaraston versio on yhteensopimaton"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Pakettivarasto on turmeltunut"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Pakettivarasto on tehty muulle arkkitehtuurille"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Riippuvuudet"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Esiriippuvuudet"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Ehdotukset"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Suosittelut"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Ristiriidat"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Korvaavuudet"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Täydet korvaavuudet"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Rikkoo"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "tärkeä"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "välttämätön"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "perus"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "valinnainen"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "ylimääräinen"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Muodostetaan riippuvuussuhteiden puu"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Mahdolliset versiot"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Luodaan riippuvuudet"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Luetaan tilatiedot"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Tilatiedoston %s avaaminen ei onnistunut"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Avataan %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Tiedostoa %s ei voitu avata"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Tämän asennusajo vaatii tilapäisesti poistettavaksi välttämättömän paketin "
-"%s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, "
-"mutta jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
-"paketit."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Luettelokansio %spartial puuttuu."
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arkistokansio %spartial puuttuu."
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Luettelokansiota ei voitu lukita"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Noudetaan tiedosto %li / %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Menetelmän ajuria %s ei löytynyt"
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Menetelmä %s ei käynnistynyt oikein"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "stat %s ei onnistu."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Pakettiluettelonn tai tilatiedoston avaaminen tai jäsennys epäonnistui."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Tunnistetyyppi %s on tuntematon"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Jummijammi, tämä APT ei osaa käsitellä noin montaa kuvausta."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia."
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "stat ei toiminut lähdepakettiluettelolle %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Luetaan pakettiluetteloita"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Kootaan tiedostojen tarjoamistietoja"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Tarkistussumma ei täsmää"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Koko ei täsmää"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Virheellinen toiminto %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3048,12 +2212,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3062,12 +2226,12 @@ msgstr ""
 "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
 "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3075,71 +2239,131 @@ msgstr ""
 "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
 "kenttää."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Toimittajan lohkosta %s puuttuu sormenjälki"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
+msgid "List directory %spartial is missing."
+msgstr "Luettelokansio %spartial puuttuu."
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Huomautus, valitaan %s eikä %s\n"
+msgid "Archives directory %spartial is missing."
+msgstr "Arkistokansio %spartial puuttuu."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Luettelokansiota ei voitu lukita"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)"
+
+#: apt-pkg/acquire.cc:901
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Noudetaan tiedosto %li / %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
+"käytetty vanhoja. "
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Virheellinen rivi korvautustiedostossa: %s"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Tunnistetyyppi %s on tuntematon"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
+msgid "Could not configure '%s'. "
+msgstr "Tiedostoa %s ei voitu avata"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Toimittajan lohkosta %s puuttuu sormenjälki"
+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 ""
+"Tämän asennusajo vaatii tilapäisesti poistettavaksi välttämättömän paketin "
+"%s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, "
+"mutta jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Irrotetaan romppu...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Käytetään rompun liitoskohtaa %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Irrotetaan romppu\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Odotetaan levyä...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Liitetään romppu...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Tunnistetaan... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Tallennettu nimio: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Irrotetaan romppu...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Etsitään levyltä hakemistotiedostoja...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3148,22 +2372,22 @@ msgstr ""
 "Hakemistoja löytyi: Asennuspakettien %zu, lähdekoodipakettien %zu, "
 "käännösten %zu ja allekirjoituksia löytyi %zu\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Löytyi nimiö: \"%s\"\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3172,304 +2396,1113 @@ msgstr ""
 "Tämä levy on: \n"
 "\"%s\"\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Kopioidaan pakettiluetteloita..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Kirjoitetaan uusi lähdeluettelo\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Kirjoitettiin %i tietuetta.\n"
+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/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
+"paketit."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Muodostetaan riippuvuussuhteiden puu"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Mahdolliset versiot"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Luodaan riippuvuudet"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Luetaan tilatiedot"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n"
+msgid "Failed to open StateFile %s"
+msgstr "Tilatiedoston %s avaaminen ei onnistunut"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta "
-"tiedostoa\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+msgid "Unable to parse package file %s (1)"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Kohteen %s tarkistussumma ei täsmää"
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Tehtävää %s ei löytynyt"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Pakettia %s ei löytynyt"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Pakettia %s ei löytynyt"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Huomautus, valitaan %s eikä %s\n"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Virheellinen rivi korvautustiedostossa: %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
+
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
-"käytetty vanhoja. "
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Avataan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Asennetaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Tehdään asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Poistetaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s poistettiin kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Suoritetaan jälkiasennusliipaisin %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Kansio \"%s\" puuttuu."
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Valmistellaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Puretaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Valmistaudutaan tekemään asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s asennettu"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Valmistaudutaan poistamaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s poistettu"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Valmistaudutaan poistamaan %s kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s poistettiin kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Luettelokansiota ei voitu lukita"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Valintaa %s ei löydy"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Lukkotiedostoa %s ei voitu avata"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Lukkoa %s ei saada"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Aliprosessi %s aiheutti suojausvirheen."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Aliprosessi %s aiheutti suojausvirheen."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Aliprosessi %s palautti virhekoodin (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Aliprosessi %s lopetti odottamatta"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Pulmia tiedoston sulkemisessa"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Tiedostoa %s ei voitu avata"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Putkea %s ei voitu avata"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Pakkaajan käynnistäminen ei onnistunut"
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "read, vielä %lu lukematta mutta tiedosto loppui"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Pulmia tiedoston sulkemisessa"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Pulmia tehtäessä tiedostolle sync"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Pulmia tehtäessä tiedostolle unlink"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Pulmia tehtäessä tiedostolle sync"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Virhe!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Valmis"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Valmis"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Putkea %s ei voitu avata"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Ei voitu tehdä %lu tavun mmap:ia"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Tiedoston %s avaaminen ei onnistunut"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Käynnistys ei onnistu"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Ei voitu tehdä %lu tavun mmap:ia"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Tiedoston typistäminen ei onnistunut"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Komento stat ei toiminut liitoskohdalle %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Komento stat ei toiminut rompulle"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Tuntematon tyypin lyhenne: \"%c\""
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Avataan asetustiedosto %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, 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:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Asennus keskeytetään."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Komentorivin valitsin \"%c\" [%s] on tuntematon."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Komentorivin valitsin %s on tuntematon"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Komentorivin valitsin %s ei ole totuusarvoinen"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Valitsin %s tarvitsee parametrin"
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Valitsin %s: Asetusarvon määrityksessä on oltava =<arvo>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Valitsin %s tarvitsee kokonaislukuparametrin, ei \"%s\""
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Valitsin \"%s\" on liian pitkä"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Arvo %s on tuntematon, yritä tosi tai epätosi."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Virheellinen toiminto %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
+"\n"
+"apt-extracttemplates on työkalu asetus- ja mallitietojen \n"
+"poimintaan debian-paketeista\n"
+"\n"
+"Valitsimet:\n"
+"  -h   Tämä ohje\n"
+"  -t   Aseta väliaikaisten tiedostojen kansio\n"
+"  -c=? Lue tämä asetustiedosto\n"
+"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Tiedostolle %s ei toimi stat"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Paketin laajennuslista on liian pitkä"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Tapahtui virhe käsiteltäessa kansiota %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Lähteiden laajennuslista on liian pitkä"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr ""
+"Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Käyttö: apt-ftparchive [valitsimet] komento\n"
+"Komennot: packages binääripolku [poikkeustdsto [polun alku]]\n"
+"          sources lähdepolku [poikkeustdsto [polun alku]]\n"
+"          contents polku\n"
+"          release polku\n"
+"          generate asetukset [ryhmät]\n"
+"          clean asetukset\n"
+"\n"
+"apt-ftparchive tuottaa hakemistoja Debianin arkistoista. Monta "
+"tuottamistapaa\n"
+"on tuettu alkaen täysin automaattisista toiminnallisesti samoihin kuin\n"
+"dpkg-scanpackages ja dpkg-scansources.\n"
+"\n"
+"apt-ftparchive tuottaa pakettitiedostoja .deb-tiedostojen puusta.\n"
+"Pakettitiedostossa on kunkin paketin kaikkien ohjauskenttien\n"
+"sisältö sekä MD5 tiiviste ja tiedoston koko. Poikkeus-\n"
+"tiedostolla voidaan arvot Priority ja Section pakottaa halutuiksi.\n"
+"\n"
+"Samaan tapaan apt-ftparchive tuottaa lähdetiedostoja\n"
+".dscs-tiedostojen puusta. Valitsimella --source-overrride voidaan\n"
+"määrittää lähteiden poikkeustiedosto.\n"
+"\n"
+"Komennot \"packages\" ja \"sources\" olisi suoritettava puun juuressa.\n"
+"Binääripolun olisi osoitettava rekursiivisen haun alkukohtaan ja\n"
+"poikkeustiedostossa olisi oltava poikkeusilmaisimet. Polun alku\n"
+"yhdistetään tiedoston nimeen jos se on annettu. Esimerkki\n"
+"käytöstä Debianin arkiston kanssa:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Valitsimet:\n"
+"  -h    Tämä ohje\n"
+"  --md5 MD5 luonti\n"
+"  -s=?  Lähteiden poikkeustdosto\n"
+"  -q    Ei tulostusta\n"
+"  -d=?  Valinnainen välimuistitietokanta\n"
+"  --no-delink delinking-virheenjäljitys päälle\n"
+"  --contents  Sisällysluettelotiedoston luonti\n"
+"  -c=?  Lue tämä asetustiedosto\n"
+"  -o=?  Aseta mikä asetusvalitsin tahansa"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Mitkään valinnat eivät täsmänneet"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Tietokanta on vanha, yritetään päivittää %s"
+
+#: ftparchive/cachedb.cc:80
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, "
+"on tietokanta poistettava ja luotava uudelleen."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Tietokantatiedostoa %s ei saatu avattua: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Arkistolla ei ole ohjaustietuetta"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Kohdistinta ei saada"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Kansiota %s ei voi lukea\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Tdstolle %s ei toimi stat\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Tiedostossa virheitä "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Osoitteen %s selvitys ei onnistunut"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Puun läpikäynti ei onnistunut"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Tiedoston %s avaaminen ei onnistunut"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "readlink %s ei onnistunut"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "unlink %s ei onnistunut"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Linkin %s -> %s luonti ei onnistunut"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLinkin yläraja %st saavutettu.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Arkistossa ei ollut pakettikenttää"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s:llä ei ole poikkeustietuetta\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s ylläpitäjä on %s eikä %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s:llä ei ole poikkeustietuetta\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s:llä ei  ole binääristäkään poikkeustietuetta\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Muistin varaaminen ei onnistunut"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Tiedoston %s avaaminen ei onnistunut"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Poikkeustiedoston %s lukeminen ei onnistunut"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Tuntematon pakkausalgoritmi \"%s\""
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "FILE* luominen ei onnistunut"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "fork ei onnistunut"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Compress-lapsiprosessi"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
+"\n"
+"apt-extracttemplates on työkalu asetus- ja mallitietojen \n"
+"poimintaan debian-paketeista\n"
+"\n"
+"Valitsimet:\n"
+"  -h   Tämä ohje\n"
+"  -t   Aseta väliaikaisten tiedostojen kansio\n"
+"  -c=? Lue tämä asetustiedosto\n"
+"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Tuntematon pakettitietue!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Käyttö: apt-sortpkgs [valitsimet] tdsto1 [tdsto2 ...]\n"
+"\n"
+"apt-sortpkgs on yksinkertainen työkalu pakettitiedostojen lajitteluun.\n"
+"Valitsimella -s ilmaistaan minkälainen tiedosto on.\n"
+"\n"
+"Valitsimet:\n"
+"  -h   Tämä ohje\n"
+"  -s   Käytä lähdetiedostolajittelua\n"
+"  -c=? Lue tämä asetustiedosto\n"
+"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s ei kelpaa DEB-paketiksi."
 
diff --git a/po/fr.po b/po/fr.po
index 9aee2236c..73de51c42 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2013-08-17 07:57+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -19,152 +19,153 @@ msgstr ""
 "X-Generator: Lokalize 1.5\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Nombre total de paquets : "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Nombre total de structures de paquets : "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Paquets ordinaires : "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Paquets entièrement virtuels : "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Paquets virtuels simples : "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Paquets virtuels mixtes : "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Manquants : "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Nombre de versions distinctes : "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Nombre de descriptions distinctes : "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Nombre de dépendances : "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Nombre de relations version/fichier : "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Nombre de relations description/fichier : "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Nombre de relations « Provides » : "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Nombre de motifs rationnels : "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Espace occupé par les versions des dépendances : "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Espace disque gaspillé : "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Total de l'espace attribué : "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Fichier %s désynchronisé."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Aucun paquet n'a été trouvé"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Vous devez fournir au moins un motif de recherche"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Cette commande est obsolète. Veuillez utiliser « apt-mark showauto »."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Fichiers du paquet :"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Paquets épinglés :"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(non trouvé)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Installé : "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Candidat : "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(aucun)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Épinglage de paquet : "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr " Table de version :"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -238,34 +239,35 @@ msgstr ""
 "plus\n"
 "d'informations.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-"Aucun CD n'a été détecté sur le point de montage par défaut.\n"
-"Vous pouvez utiliser l'option --cdrom pour indiquer le point de montage du "
-"CD-ROM. Voir la page de manuel d'apt-cdrom pour plus d'informations sur "
-"l'auto-détection des CD et le point de montage."
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Veuillez indiquer le nom de ce disque, par exemple « Debian 5.0.3 Disk 1 »"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 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"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Impossible de monter « %s » sur « %s »"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+#, fuzzy
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+"Aucun CD n'a été détecté sur le point de montage par défaut.\n"
+"Vous pouvez utiliser l'option --cdrom pour indiquer le point de montage du "
+"CD-ROM. Voir la page de manuel d'apt-cdrom pour plus d'informations sur "
+"l'auto-détection des CD et le point de montage."
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 "Veuillez répéter cette opération pour tous les disques de votre jeu de "
@@ -303,53 +305,53 @@ msgstr ""
 "   -c=? Lit ce fichier de configuration\n"
 "   -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 "Impossible de trouver de paquet correspondant à l'expression rationnelle "
 "« %s »"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 "Impossible de trouver de paquet correspondant à l'expression rationnelle "
 "« %s »"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 "Impossible de trouver de paquet correspondant à l'expression rationnelle "
 "« %s »"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Choix de « %s » comme paquet source à la place de « %s »\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "La version « %s » indisponible du paquet « %s » est ignorée"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s passé en « installé manuellement ».\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s passé en « installé automatiquement ».\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -357,21 +359,21 @@ msgstr ""
 "Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et « apt-"
 "mark manual »."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 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:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Impossible de verrouiller le répertoire de téléchargement"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossible de trouver une source de paquet pour %s"
@@ -398,80 +400,80 @@ msgstr ""
 "pour récupérer les dernières mises à jour (éventuellement non encore "
 "publiées) du paquet.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, 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:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossible de déterminer l'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Nécessité de prendre %so/%so dans les sources.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, 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:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Récupération des sources %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Échec lors de la récupération de quelques archives."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 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:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "La commande de décompactage « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "La commande de construction « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Échec du processus fils"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -481,17 +483,17 @@ msgstr ""
 "consulter la section à propos de APT::Architectures dans la page de manuel "
 "apt.conf(5)."
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s n'a pas de dépendance de construction.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -500,7 +502,7 @@ msgstr ""
 "La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas "
 "autorisé avec les paquets « %s »."
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -509,14 +511,14 @@ 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:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -525,7 +527,7 @@ msgstr ""
 "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
 "disponible du paquet %s ne peut satisfaire les prérequis de version."
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -534,31 +536,31 @@ msgstr ""
 "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s "
 "n'a pas de version disponible."
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, 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:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Impossible d'activer les dépendances de construction"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Journal des modifications pour %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Modules reconnus :"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -648,55 +650,76 @@ msgstr ""
 "apt.conf(5) pour plus d'informations et d'options.\n"
 "                      Cet APT a les « Super Cow Powers »\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Vous devez spécifier au moins un paquet source"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s ne peut pas être marqué car il n'est pas installé.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s était déjà marqué comme installé manuellement.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s était déjà marqué comme installé automatiquement.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s était déjà marqué comme figé (« hold »).\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s était déjà marqué comme non figé.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "A attendu %s mais il n'était pas présent"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s passé en figé (« hold »).\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Annulation de l'état figé pour %s.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 "Échec de l'exécution de dpkg. Possédez-vous les privilèges du "
 "superutilisateur ?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -746,7 +769,7 @@ msgstr ""
 "Veuillez consulter les pages de manuel apt-mark(8) et apt.conf(5)\n"
 "pour plus d'informations."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -796,52 +819,52 @@ msgstr ""
 msgid "Disk not found."
 msgstr "Disque non trouvé."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Fichier non trouvé"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Impossible de statuer"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Impossible de modifier l'heure "
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Liens invalides, les liens locaux ne doivent pas débuter avec //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Connexion en cours"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Impossible de déterminer le nom de la machine distante"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Impossible de déterminer le nom local"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Le serveur a refusé notre connexion et a répondu : %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER incorrect, le serveur a répondu : %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS incorrect, le serveur a répondu : %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -849,123 +872,125 @@ msgstr ""
 "Un serveur proxy a été spécifié, mais aucun script de connexion, Acquire::"
 "ftp::ProxyLogin est vide."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, 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"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Échec de TYPE, le serveur a répondu : %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Dépassement du délai de connexion"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Le serveur a fermé la connexion"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Erreur de lecture"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Une réponse a fait déborder le tampon."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Corruption du protocole"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Erreur d'écriture"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Impossible de créer un connecteur"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 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é"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Échec"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Impossible de se connecter au port en mode passif."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "gettaddrinfo n'a pu obtenir un port d'écoute"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Impossible de se connecter à un port"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Impossible d'écouter sur le port"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Impossible de déterminer le nom du port"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Impossible d'envoyer la commande PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Famille d'adresses %u inconnue (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT a échoué, le serveur a répondu : %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Délai de connexion au port de données dépassé"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Impossible d'accepter une connexion"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problème de hachage du fichier"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Pas de réponse du port données dans les délais"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Le transfert de données a échoué, le serveur a répondu « %s »"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Requête"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Impossible d'invoquer "
 
@@ -1001,7 +1026,7 @@ msgstr "Connexion à %s: %s (%s) impossible."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connexion à %s"
@@ -1033,25 +1058,25 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossible de se connecter à %s:%s :"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Au moins une signature non valable a été rencontrée."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez "
 "vérifier si gpgv est installé)."
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1060,15 +1085,15 @@ msgstr ""
 "Le fichier signé en clair n'est pas valable, ce qui a été reçu est « %s ». "
 "Peut-être le réseau nécessite-t-il une authentification."
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Erreur inconnue à l'exécution de gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures suivantes ne sont pas valables :\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1076,118 +1101,353 @@ msgstr ""
 "Les signatures suivantes n'ont pas pu être vérifiées car la clé publique "
 "n'est pas disponible :\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Les fichiers vides ne peuvent être des archives valables"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Erreur d'écriture sur le fichier"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 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:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Erreur d'écriture sur un fichier"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Sélection défaillante"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Délai de connexion dépassé"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Erreur d'écriture du fichier de sortie"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Attente des fichiers d'en-tête"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Mauvaise ligne d'en-tête"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 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/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Ce serveur http possède un support des limites non-valide"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Format de date inconnu"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Mauvais en-tête de donnée"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calcul de la mise à jour... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Fait"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Correction des dépendances..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " a échoué."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Impossible de corriger les dépendances"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossible de minimiser le nombre des paquets mis à jour"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fait"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installé]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installé]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installé]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installé]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "mais %s est installé"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mais %s devra être installé"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "mais il n'est pas installable"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "mais c'est un paquet virtuel"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "mais il n'est pas installé"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "mais ne sera pas installé"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Les NOUVEAUX paquets suivants seront installés :"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Les paquets suivants seront ENLEVÉS :"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Les paquets suivants ont été conservés :"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Les paquets suivants seront mis à jour :"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Les paquets retenus suivants seront changés :"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (en raison de %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ATTENTION : Les paquets essentiels suivants vont être enlevés.\n"
+"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
+"que vous êtes en train de faire."
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu mis à jour, %lu nouvellement installés, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu réinstallés, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu remis à une version inférieure, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu à enlever et %lu non mis à jour.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu partiellement installés ou enlevés.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[O/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[o/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "O"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erreur de compilation de l'expression rationnelle - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "La commande de mise à jour ne prend pas de paramètre"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 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."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erreur interne. Le tri a été interrompu."
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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."
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Il est nécessaire de prendre %so dans les archives.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1195,21 +1455,21 @@ msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Pas assez d'espace disponible sur %s"
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 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"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 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 "
@@ -1219,11 +1479,11 @@ msgstr ""
 # sentence is supposed to be typed by a user who cannot see the difference.
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Oui, faites ce que je vous dis !"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1234,19 +1494,19 @@ msgstr ""
 "Pour continuer, tapez la phrase « %s »\n"
 " ?]"
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Annulation."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Souhaitez-vous continuer ?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Certains fichiers n'ont pu être téléchargés."
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1254,20 +1514,20 @@ msgstr ""
 "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-"
 "get update ou essayer avec --fix-missing ?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 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."
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Impossible de corriger le fait que les paquets manquent."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Annulation de l'installation."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1281,18 +1541,18 @@ msgstr[1] ""
 "Les paquets suivants ont disparu du système car tous leurs fichiers\n"
 "ont été remplacés par d'autres paquets :"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 "Note : cette opération volontaire (effectuée par dpkg) est automatique."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Aucune suppression n'est censée se produire : impossible de lancer "
 "« Autoremover »"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1311,16 +1571,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "L'information suivante devrait vous aider à résoudre la situation : "
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 "Erreur interne, l'outil de suppression automatique a cassé quelque chose."
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1332,7 +1592,7 @@ msgstr[1] ""
 "Les paquets suivants ont été installés automatiquement et ne sont plus "
 "nécessaires :"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1342,18 +1602,18 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Veuillez utiliser « apt-get autoremove » pour le supprimer."
 msgstr[1] "Veuillez utiliser « apt-get autoremove » pour les supprimer."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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 :"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1361,7 +1621,7 @@ msgstr ""
 "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
 "(ou indiquez une solution)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1373,325 +1633,98 @@ msgstr ""
 "la distribution unstable, que certains paquets n'ont pas encore\n"
 "été créés ou ne sont pas sortis d'Incoming."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Paquets défectueux"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Les paquets supplémentaires suivants seront installés : "
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Paquets suggérés :"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Paquets recommandés :"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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\n"
+"      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\n"
+"      de la réalité !"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Avertissement d'authentification ignoré.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Certains paquets n'ont pas pu être authentifiés"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Faut-il installer ces paquets sans vérification ?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossible de récupérer %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installé]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installé]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installé]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installé]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "mais %s est installé"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mais %s devra être installé"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "mais il n'est pas installable"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "mais c'est un paquet virtuel"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "mais il n'est pas installé"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "mais ne sera pas installé"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Les NOUVEAUX paquets suivants seront installés :"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Les paquets suivants seront ENLEVÉS :"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Les paquets suivants ont été conservés :"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Les paquets suivants seront mis à jour :"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Les paquets retenus suivants seront changés :"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (en raison de %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ATTENTION : Les paquets essentiels suivants vont être enlevés.\n"
-"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
-"que vous êtes en train de faire."
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu mis à jour, %lu nouvellement installés, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu réinstallés, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu remis à une version inférieure, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu à enlever et %lu non mis à jour.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu partiellement installés ou enlevés.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[O/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[o/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "O"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erreur de compilation de l'expression rationnelle - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Correction des dépendances..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " a échoué."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Impossible de corriger les dépendances"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossible de minimiser le nombre des paquets mis à jour"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Fait"
-
-#: apt-private/private-cachefile.cc:102
-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."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "La commande de mise à jour ne prend pas de paramètre"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Calcul de la mise à jour... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Fait"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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\n"
-"      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\n"
-"      de la réalité !"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Impossible de changer le nom %s en %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Atteint "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Réception de : "
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%so réceptionnés en %s (%so/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [En cours]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1704,19 +1737,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossible de lire %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Impossible d'accéder à %s"
@@ -1745,11 +1778,11 @@ msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »."
 msgid "[Mirror: %s]"
 msgstr "[Miroir : %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Impossible de créer le tube IPC sur le sous-processus"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Connexion fermée prématurément"
 
@@ -1792,1375 +1825,461 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Fusion des informations disponibles"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Usage : apt-extracttemplates fichier1 [fichier2 ...]\n"
-"\n"
-"apt-extracttemplates est un outil pour extraire la configuration et les\n"
-"informations des gabarits des paquets Debian\n"
-"\n"
-"Options :\n"
-"   -h   Ce texte d'aide\n"
-"   -t   Place le répertoire temporaire\n"
-"   -c=? Lit ce fichier de configuration\n"
-"   -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Impossible d'écrire sur %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr ""
-"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "La liste d'extension du paquet est trop longue"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Erreur lors du traitement du répertoire %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "La liste d'extension des sources est trop grande"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Erreur du traitement du contenu %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Usage : apt-ftparchive [options] commande\n"
-"Commandes :  paquets binarypath [fichier d'« override » [chemin du "
-"préfixe]]\n"
-"             sources srcpath [fichier d'« override » [chemin du préfixe]]\n"
-"             contents path\n"
-"             release path\n"
-"             generate config [groupes]\n"
-"             clean config\n"
-"\n"
-"apt-ftparchive génère des fichiers d'index pour les archives Debian. Il\n"
-"supporte de nombreux types de génération, d'une automatisation complète à\n"
-"des remplacements fonctionnels pour dpkg-scanpackages et dpkg-scansources\n"
-"\n"
-"apt-ftparchive génère les fichiers de paquets à partir d'un arbre de .debs.\n"
-"Le fichier des paquets contient les contenus de tous les champs de contrôle\n"
-"de chaque paquet aussi bien que les hachés MD5 et la taille du fichier. Un\n"
-"fichier d'« override » est accepté pour forcer la valeur des priorités et\n"
-"des sections\n"
-"\n"
-"De façon similaire, apt-ftparchive génère des fichiers de source à partir\n"
-"d'un arbre de .dscs. L'option --source-override peut être employée pour\n"
-"spécifier un fichier src d'« override »\n"
-"\n"
-"Les commandes « packages » et « sources » devraient être démarrées à la\n"
-"racine de l'arbre. « BinaryPath » devrait pointer sur la base d'une\n"
-"recherche récursive et le fichier d'« override » devrait contenir les\n"
-"drapeaux d'annulation. « Pathprefix » est ajouté au champ du non de\n"
-"fichier s'il est présent. Exemple d'utilisation d'archive Debian :\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options :\n"
-"  -h     Ce texte d'aide\n"
-"  --md5  Contrôle la génération des MD5\n"
-"  -s=?   Fichier d'« override » pour les sources\n"
-"  -q     Silencieux\n"
-"  -d=?   Sélectionne la base de données optionnelle de cache\n"
-"  --no-delink Permet le mode de débogage délié\n"
-"  --contents  Contrôle la génération de fichier\n"
-"  -c=? Lit ce fichier de configuration\n"
-"  -o=? Place une option de configuration arbitraire"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Aucune sélection ne correspond"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, 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 »"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Base de données corrompue, fichier renommé en %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Base de données ancienne, tentative de mise à jour de %s\""
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Le format de la base de données n'est pas valable. Si vous mettez APT à "
-"jour, veuillez supprimer puis recréer la base de données."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Impossible d'ouvrir le fichier de base de données %s : %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Impossible de statuer %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "L'archive n'a pas d'enregistrement de contrôle"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Impossible d'obtenir un curseur"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A : Impossible de lire le contenu du répertoire %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A : Impossible de statuer %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E : "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "A : "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E : des erreurs sont survenues sur le fichier "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Impossible de résoudre %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Échec du parcours de l'arbre"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Impossible d'ouvrir %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Délier %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Impossible de lire le lien %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Impossible de délier %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Impossible de lier %s à %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Seuil de delink de %so atteint.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "L'archive ne possède pas de champ de paquet"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "%s ne possède pas d'entrée « override »\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " le responsable de %s est %s et non %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ne possède pas d'entrée « source override »\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s ne possède pas également pas d'entrée « binary override »\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Échec de l'allocation de mémoire"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Impossible d'ouvrir %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Impossible de lire le fichier d'« override » %s"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Entrée « override » %s mal formée %llu n° 2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Entrée « override » %s mal formée %llu n° 3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algorithme de compression « %s » inconnu"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "La sortie compressée %s a besoin d'un ensemble de compression"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Impossible de créer FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Échec du fork"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Fils compressé"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Erreur interne, impossible de créer %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Échec d'entrée/sortie du sous-processus sur le fichier"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Impossible de lire lors du calcul de la somme MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problème en déliant %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Impossible de changer le nom %s en %s"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Utilisation: apt-internal-solver\n"
-"\n"
-"apt-internal-solver est une interface en ligne de commande\n"
-"permettant d'utiliser la résolution interne d'apt de manière externe\n"
-"avec les outils de la famille d'APT  à des fins de déboguage ou\n"
-"équivalent.\n"
-"\n"
-"Options:\n"
-"  -h  La présente aide.\n"
-"  -q  Affichage journalisable - pas de barre de progression\n"
-"  -c=? lecture du fichier de configuration indiqué\n"
-"  -o=? utilisation d'une option de configuration,\n"
-"       p. ex. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Enregistrement de paquet inconnu !"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Usage : apt-sortpkgs [options] fichier1 [fichier2 ...]\n"
-"\n"
-"apt-sortpkgs est un outil simple pour trier les paquets. L'option -s est\n"
-"employée pour indiquer le type de fichier dont il s'agit.\n"
-"\n"
-"Options :\n"
-"  -h   Ce texte d'aide\n"
-"  -s   Trie le fichier source\n"
-"  -c=? Lit ce fichier de configuration\n"
-"  -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/"
-"tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Échec de création de tubes"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Impossible d'exécuter gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Archive corrompue"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Signature d'archive invalide"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Erreur de lecture de l'en-tête du membre d'archive"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "En-tête du membre d'archive %s non valable"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "En-tête du membre d'archive non-valable"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "L'archive est trop petite"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Échec de la lecture des en-têtes d'archive"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode appelé sur un nœud toujours lié"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Impossible de situer l'élément haché !"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Échec lors de l'allocation de la déviation"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Erreur interne dans AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Essaye d'écraser une déviation, %s -> %s et %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Addition double d'une déviation %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Fichier de configuration en double %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Erreur d'écriture du fichier %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Échec de clôture du fichier %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Le chemin %s est trop long"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Veuillez décompresser %s plus d'une fois"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Le répertoire %s est détourné"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Le chemin de déviation est trop long"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Impossible de statuer %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Impossible de changer le nom %s en %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Le répertoire %s va être remplacé par un non-répertoire"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Échec pour localiser le nœud dans la table de hachage"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Le chemin est trop long"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Écrase la correspondance de paquet sans version pour %s "
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Impossible de statuer pour %s."
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Erreur d'écriture du fichier %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Échec de clôture du fichier %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Ce n'est pas une archive DEB valide,  partie « %s » manquante"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Erreur interne, ne peut localiser la partie %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Fichier de contrôle non traitable"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Impossible de mapper un fichier vide en mémoire"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Impossible de dupliquer le descripteur de fichier %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Impossible de réaliser un mapping de %llu octets en mémoire"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Impossible de fermer la « mmap »"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Impossible de synchroniser la « mmap »"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-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:322
-msgid "Failed to truncate file"
-msgstr "Échec de la troncature du fichier"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"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-Start, dont la valeur "
-"actuelle est de %lu (voir « man 5 apt.conf »)."
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Impossible d'augmenter la taille de la « mmap » car la limite de %lu octets "
-"est déjà atteinte."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Impossible d'augmenter la taille de la « mmap » car l'augmentation "
-"automatique a été désactivée par une option utilisateur."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Signature d'archive invalide"
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Erreur de lecture de l'en-tête du membre d'archive"
 
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Selection %s not found"
-msgstr "La sélection %s n'a pu être trouvée"
+msgid "Invalid archive member header %s"
+msgstr "En-tête du membre d'archive %s non valable"
 
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Type d'abréviation non reconnue : « %c »"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "En-tête du membre d'archive non-valable"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Ouverture du fichier de configuration %s"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "L'archive est trop petite"
 
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom."
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Échec de la lecture des en-têtes d'archive"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Erreur syntaxique %s:%u : balise mal formée"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Échec de création de tubes"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Impossible d'exécuter gzip "
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Archive corrompue"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée"
+msgid "Unable to stat %s."
+msgstr "Impossible de localiser %s."
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Erreur de syntaxe %s:%u : la directive « clear » a besoin d'un arbre "
-"d'options comme paramètre"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Erreur !"
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Fait"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr "…"
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s… %u%%"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "L'option « %c » de la ligne de commande [d'origine %s] est inconnue."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "L'option %s de la ligne de commande n'est pas reconnue"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "L'option %s de la ligne de commande n'est pas une valeur booléenne"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "L'option %s nécessite un paramètre."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Option %s : l'item configuration doit être spécifiée avec un =<val>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "L'option %s prend un nombre entier en paramètre, et non « %s »"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Exécution de dpkg"
 
-#: apt-pkg/contrib/cmndline.cc:304
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "L'option « %s » est trop longue"
+msgid "Packaging system '%s' is not supported"
+msgstr "Le système de paquet « %s » n'est pas supporté"
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "La signification %s n'est pas comprise, veuillez essayer vrai ou faux."
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Impossible de déterminer un type du système de paquets adéquat"
 
-#: apt-pkg/contrib/cmndline.cc:386
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Invalid operation %s"
-msgstr "L'opération %s n'est pas valable"
+msgid "Wrote %i records.\n"
+msgstr "%i enregistrements écrits.\n"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Impossible de localiser le point de montage %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Impossible d'accéder au cédérom."
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problème de fermeture du fichier gzip %s"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
 
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Verrou non utilisé pour le fichier %s en lecture seule"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+"%i enregistrements écrits avec %i fichiers manquants et %i qui ne "
+"correspondent pas\n"
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open lock file %s"
-msgstr "Impossible d'ouvrir le fichier verrou %s"
+msgid "Can't find authentication record for: %s"
+msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs"
+msgid "Hash mismatch for: %s"
+msgstr "Somme de contrôle de hachage incohérente pour %s"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not get lock %s"
-msgstr "Impossible d'obtenir le verrou %s"
+msgid "The method driver %s could not be found."
+msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-"La liste des fichiers ne peut pas être créée car « %s » n'est pas un "
-"répertoire"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-"« %s » dans le répertoire « %s » a été ignoré car ce n'est pas un fichier "
-"ordinaire"
+msgid "Method %s did not start correctly"
+msgstr "La méthode %s n'a pas démarré correctement"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"« %s » dans le répertoire « %s » a été ignoré car il n'utilise pas "
-"d'extension"
+"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
+"touche Entrée."
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"« %s » dans le répertoire « %s » a été ignoré car il utilise une extension "
-"non valable"
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, 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:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Le sous-processus %s a reçu le signal %u"
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, 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:870 apt-pkg/contrib/gpgv.cc:230
-#, 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:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Impossible d'ouvrir le fichier %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Impossible d'ouvrir le descripteur de fichier %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Impossible de créer un sous-processus IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Impossible d'exécuter la compression "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "lu(s), %llu restant à lire, mais rien n'est disponible"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "Problème de fermeture du fichier %s"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problème de renommage du fichier %s en %s"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problème de suppression du lien %s"
+"Les listes de paquets ou le fichier « status » ne peuvent être analysés ou "
+"lus."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problème de synchronisation du fichier"
+#: apt-pkg/cachefile.cc:98
+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."
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Pas de porte-clés installé dans %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "La liste des sources ne peut être lue."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Cache des paquets vide"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Le fichier de cache des paquets est corrompu"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Le fichier de cache des paquets a une version incompatible"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Le fichier de cache des paquets est corrompu, il est trop petit."
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 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:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Dépend"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Pré-Dépend"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Suggère"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Recommande"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Est en conflit avec"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Remplace"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Rend obsolète"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Casse"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Améliore"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "nécessaire"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "optionnel"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "supplémentaire"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Construction de l'arbre des dépendances"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Versions possibles"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Génération des dépendances"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Lecture des informations d'état"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Impossible d'ouvrir le fichier d'état %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Erreur d'écriture du fichier d'état temporaire %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Impossible de traiter le fichier %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Impossible de traiter le fichier %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser "
-"[option])"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une "
-"affectation)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de "
-"valeur)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, 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)"
-
-#: apt-pkg/sourcelist.cc:215
-#, 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)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Ouverture de %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr ""
-"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Impossible d'effectuer la configuration immédiate de « %s ». Veuillez "
-"consulter la page de manuel apt.conf(5) et notamment la section à propos de "
-"APT::Immediate-Configure, pour plus d'informations. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Impossible de configurer « %s »."
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Cette installation va temporairement nécessiter l'enlèvement du paquet "
-"essentiel %s en raison d'une boucle entre les champs Conflicts et Pre-"
-"Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement "
-"le faire, activez l'option APT::Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Le type de fichier d'index « %s » n'est pas accepté"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-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:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Erreur, pkgProblem::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:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Impossible de corriger les problèmes, des paquets défectueux sont en mode "
-"« garder en l'état »."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Le répertoire %spartial pour les listes n'existe pas."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Le répertoire d'archive %spartial n'existe pas."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Impossible de verrouiller le répertoire %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, 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:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Téléchargement du fichier %li sur %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "La méthode %s n'a pas démarré correctement"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Le système de paquet « %s » n'est pas supporté"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Impossible de déterminer un type du système de paquets adéquat"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossible de localiser %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Vous devez insérer quelques adresses « sources » dans votre sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Les listes de paquets ou le fichier « status » ne peuvent être analysés ou "
-"lus."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "La liste des sources ne peut être lue."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"La valeur « %s » n'est pas valable pour APT::Default-Release car cette "
-"version ne fait pas partie des sources disponibles."
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-"Enregistrement non valable dans le fichier de préférences %s, aucune entrée "
-"« Package »."
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Type d'épinglage %s inconnu"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'épinglage"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Le cache possède un système de version incompatible"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Erreur apparue lors du traitement de %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Vous avez dépassé le nombre de noms de paquets que cette version d'APT est "
 "capable de traiter."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Vous avez dépassé le nombre de versions que cette version d'APT est capable "
 "de traiter."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Vous avez dépassé le nombre de descriptions que cette version d'APT est "
 "capable de traiter."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Vous avez dépassé le nombre de dépendances que cette version d'APT est "
 "capable de traiter."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des "
 "fichiers"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Impossible de localiser la liste des paquets sources %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Lecture des listes de paquets"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Assemblage des fichiers listés dans les champs Provides"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Impossible d'écrire sur %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr ""
 "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Envoi du scénario au solveur"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Envoi d'une requête au solveur"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Préparation à la réception de la solution"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "Échec du solveur externe sans message d'erreur adapté"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Exécu tion du solveur externe"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "impossible de changer le nom, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Somme de contrôle de hachage incohérente"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Taille incohérente"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "L'opération %s n'est pas valable"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3169,18 +2288,18 @@ msgstr ""
 "Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : "
 " ligne non valable dans sources.list ou fichier corrompu"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr ""
 "Impossible de trouver la comme de contrôle de « %s » dans le fichier Release"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3189,12 +2308,12 @@ msgstr ""
 "Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises "
 "à jour depuis ce dépôt  ne s'effectueront pas."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3205,12 +2324,12 @@ msgstr ""
 "GPG : %s : %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Erreur de GPG : %s : %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3219,14 +2338,14 @@ msgstr ""
 "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:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 "Impossible de trouver une source de téléchargement de la version « %s » de "
 "« %s »"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3234,71 +2353,139 @@ msgstr ""
 "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
 "pour le paquet %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossible d'analyser le fichier Release %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Pas de sections dans le fichier Release %s"
+msgid "List directory %spartial is missing."
+msgstr "Le répertoire %spartial pour les listes n'existe pas."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Pas d'entrée de hachage dans le fichier Release %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Le répertoire d'archive %spartial n'existe pas."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s"
+msgid "Unable to lock directory %s"
+msgstr "Impossible de verrouiller le répertoire %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrée « Date » non valable dans le fichier Release %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Téléchargement du fichier %li sur %li (%s restant)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte"
+msgid "Retrieving file %li of %li"
+msgstr "Téléchargement du fichier %li sur %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+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/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Vous devez insérer quelques adresses « sources » dans votre sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"La valeur « %s » n'est pas valable pour APT::Default-Release car cette "
+"version ne fait pas partie des sources disponibles."
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
+"Enregistrement non valable dans le fichier de préférences %s, aucune entrée "
+"« Package »."
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Type d'épinglage %s inconnu"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'épinglage"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Impossible d'effectuer la configuration immédiate de « %s ». Veuillez "
+"consulter la page de manuel apt.conf(5) et notamment la section à propos de "
+"APT::Immediate-Configure, pour plus d'informations. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Impossible de configurer « %s »."
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Cette installation va temporairement nécessiter l'enlèvement du paquet "
+"essentiel %s en raison d'une boucle entre les champs Conflicts et Pre-"
+"Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement "
+"le faire, activez l'option APT::Force-LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Démontage du cédérom...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Utilisation du point de montage %s pour le cédérom\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Démontage du cédérom\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Attente du disque...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Montage du cédérom...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Identification..."
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Étiquette stockée : %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Démontage du cédérom...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Examen du disque à la recherche de fichiers d'index...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3307,7 +2494,7 @@ msgstr ""
 "%zu index de paquets trouvés, %zu index de sources, %zu index de traductions "
 "et %zu signatures\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3315,16 +2502,16 @@ 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:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Étiquette « %s » trouvée\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Ce nom n'est pas valable, veuillez recommencer.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3333,87 +2520,113 @@ msgstr ""
 "Ce disque s'appelle :\n"
 "« %s »\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Copie des listes de paquets..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Écriture de la nouvelle liste de sources\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 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:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i enregistrements écrits.\n"
+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/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Erreur, pkgProblem::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/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Impossible de corriger les problèmes, des paquets défectueux sont en mode "
+"« garder en l'état »."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construction de l'arbre des dépendances"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versions possibles"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Génération des dépendances"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lecture des informations d'état"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
+msgid "Failed to open StateFile %s"
+msgstr "Impossible d'ouvrir le fichier d'état %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"%i enregistrements écrits avec %i fichiers manquants et %i qui ne "
-"correspondent pas\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Erreur d'écriture du fichier d'état temporaire %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Impossible de traiter le fichier %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Somme de contrôle de hachage incohérente pour %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Impossible de traiter le fichier %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "La version  « %s » de « %s » est introuvable"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "La version « %s » de « %s » n'a pu être trouvée"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Impossible de trouver la tâche « %s »"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 "Impossible de trouver de paquet correspondant à l'expression rationnelle "
 "« %s »"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr ""
 "Impossible de trouver de paquet correspondant à l'expression rationnelle "
 "« %s »"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet "
 "virtuel"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3422,175 +2635,250 @@ msgstr ""
 "Impossible de choisir une version installée ou candidate du paquet « %s » "
 "qui n'en n'a aucune"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un "
 "paquet virtuel"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Impossible de choisir la version installée du paquet « %s » qui n'est pas "
 "installé"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Envoi du scénario au solveur"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Impossible d'analyser le fichier Release %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Envoi d'une requête au solveur"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Pas de sections dans le fichier Release %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Préparation à la réception de la solution"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Pas d'entrée de hachage dans le fichier Release %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "Échec du solveur externe sans message d'erreur adapté"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Exécu tion du solveur externe"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrée « Date » non valable dans le fichier Release %s"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser "
+"[option])"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Exécution de dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 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."
+"Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une "
+"affectation)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de "
+"valeur)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, 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)"
+
+#: apt-pkg/sourcelist.cc:224
+#, 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)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Ouverture de %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Installation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Configuration de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Suppression complète de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Disparition de %s constatée"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Exécution des actions différées (« trigger ») de %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Répertoire %s inexistant"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Impossible d'ouvrir le fichier « %s »"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Préparation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Décompression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Préparation de la configuration de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s installé"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Préparation de la suppression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s supprimé"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Préparation de la suppression complète de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s complètement supprimé"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Impossible d'écrire sur %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "L'opération a été interrompue avant de se terminer"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "problème de dépendances : laissé non configuré"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3598,14 +2886,14 @@ msgstr ""
 "Aucun rapport « apport » n'a été créé car le message d'erreur indique une "
 "erreur consécutive à un échec précédent."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 "Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3613,7 +2901,7 @@ msgstr ""
 "Aucun « apport » n'a été créé car une erreur de dépassement de capacité "
 "mémoire a été signalée"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3621,14 +2909,14 @@ msgid ""
 msgstr ""
 "Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Aucun « apport » n'a été créé car une erreur d'entrée/sortie de dpkg a été "
 "signalée"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3637,7 +2925,7 @@ msgstr ""
 "Impossible de verrouiller le répertoire d'administration (%s). Il est "
 "possible qu'un autre processus l'utilise."
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3646,7 +2934,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3654,10 +2942,756 @@ msgstr ""
 "dpkg a été interrompu. Il est nécessaire d'utiliser « %s » pour corriger le "
 "problème."
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Non verrouillé"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "La sélection %s n'a pu être trouvée"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Verrou non utilisé pour le fichier %s en lecture seule"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Impossible d'ouvrir le fichier verrou %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Impossible d'obtenir le verrou %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+"La liste des fichiers ne peut pas être créée car « %s » n'est pas un "
+"répertoire"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+"« %s » dans le répertoire « %s » a été ignoré car ce n'est pas un fichier "
+"ordinaire"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+"« %s » dans le répertoire « %s » a été ignoré car il n'utilise pas "
+"d'extension"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"« %s » dans le répertoire « %s » a été ignoré car il utilise une extension "
+"non valable"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, 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:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Le sous-processus %s a reçu le signal %u"
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, 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:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problème de fermeture du fichier gzip %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Impossible d'ouvrir le fichier %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Impossible d'ouvrir le descripteur de fichier %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Impossible de créer un sous-processus IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Impossible d'exécuter la compression "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "lu(s), %llu restant à lire, mais rien n'est disponible"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problème de fermeture du fichier %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problème de renommage du fichier %s en %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problème de suppression du lien %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problème de synchronisation du fichier"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Erreur !"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Fait"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr "…"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Impossible de mapper un fichier vide en mémoire"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Impossible de dupliquer le descripteur de fichier %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Impossible de réaliser un mapping de %llu octets en mémoire"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Impossible de fermer la « mmap »"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Impossible de synchroniser la « mmap »"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+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:322
+msgid "Failed to truncate file"
+msgstr "Échec de la troncature du fichier"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"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-Start, dont la valeur "
+"actuelle est de %lu (voir « man 5 apt.conf »)."
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Impossible d'augmenter la taille de la « mmap » car la limite de %lu octets "
+"est déjà atteinte."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Impossible d'augmenter la taille de la « mmap » car l'augmentation "
+"automatique a été désactivée par une option utilisateur."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Impossible de localiser le point de montage %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Impossible d'accéder au cédérom."
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Type d'abréviation non reconnue : « %c »"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Ouverture du fichier de configuration %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Erreur syntaxique %s:%u : balise mal formée"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, 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:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Erreur de syntaxe %s:%u : la directive « clear » a besoin d'un arbre "
+"d'options comme paramètre"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Pas de porte-clés installé dans %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "L'option « %c » de la ligne de commande [d'origine %s] est inconnue."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "L'option %s de la ligne de commande n'est pas reconnue"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "L'option %s de la ligne de commande n'est pas une valeur booléenne"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "L'option %s nécessite un paramètre."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Option %s : l'item configuration doit être spécifiée avec un =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "L'option %s prend un nombre entier en paramètre, et non « %s »"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "L'option « %s » est trop longue"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "La signification %s n'est pas comprise, veuillez essayer vrai ou faux."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "L'opération %s n'est pas valable"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Usage : apt-extracttemplates fichier1 [fichier2 ...]\n"
+"\n"
+"apt-extracttemplates est un outil pour extraire la configuration et les\n"
+"informations des gabarits des paquets Debian\n"
+"\n"
+"Options :\n"
+"   -h   Ce texte d'aide\n"
+"   -t   Place le répertoire temporaire\n"
+"   -c=? Lit ce fichier de configuration\n"
+"   -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Impossible de statuer pour %s."
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr ""
+"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "La liste d'extension du paquet est trop longue"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Erreur lors du traitement du répertoire %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "La liste d'extension des sources est trop grande"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Erreur du traitement du contenu %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Usage : apt-ftparchive [options] commande\n"
+"Commandes :  paquets binarypath [fichier d'« override » [chemin du "
+"préfixe]]\n"
+"             sources srcpath [fichier d'« override » [chemin du préfixe]]\n"
+"             contents path\n"
+"             release path\n"
+"             generate config [groupes]\n"
+"             clean config\n"
+"\n"
+"apt-ftparchive génère des fichiers d'index pour les archives Debian. Il\n"
+"supporte de nombreux types de génération, d'une automatisation complète à\n"
+"des remplacements fonctionnels pour dpkg-scanpackages et dpkg-scansources\n"
+"\n"
+"apt-ftparchive génère les fichiers de paquets à partir d'un arbre de .debs.\n"
+"Le fichier des paquets contient les contenus de tous les champs de contrôle\n"
+"de chaque paquet aussi bien que les hachés MD5 et la taille du fichier. Un\n"
+"fichier d'« override » est accepté pour forcer la valeur des priorités et\n"
+"des sections\n"
+"\n"
+"De façon similaire, apt-ftparchive génère des fichiers de source à partir\n"
+"d'un arbre de .dscs. L'option --source-override peut être employée pour\n"
+"spécifier un fichier src d'« override »\n"
+"\n"
+"Les commandes « packages » et « sources » devraient être démarrées à la\n"
+"racine de l'arbre. « BinaryPath » devrait pointer sur la base d'une\n"
+"recherche récursive et le fichier d'« override » devrait contenir les\n"
+"drapeaux d'annulation. « Pathprefix » est ajouté au champ du non de\n"
+"fichier s'il est présent. Exemple d'utilisation d'archive Debian :\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options :\n"
+"  -h     Ce texte d'aide\n"
+"  --md5  Contrôle la génération des MD5\n"
+"  -s=?   Fichier d'« override » pour les sources\n"
+"  -q     Silencieux\n"
+"  -d=?   Sélectionne la base de données optionnelle de cache\n"
+"  --no-delink Permet le mode de débogage délié\n"
+"  --contents  Contrôle la génération de fichier\n"
+"  -c=? Lit ce fichier de configuration\n"
+"  -o=? Place une option de configuration arbitraire"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Aucune sélection ne correspond"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, 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 »"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Base de données corrompue, fichier renommé en %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Base de données ancienne, tentative de mise à jour de %s\""
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Le format de la base de données n'est pas valable. Si vous mettez APT à "
+"jour, veuillez supprimer puis recréer la base de données."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Impossible d'ouvrir le fichier de base de données %s : %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "L'archive n'a pas d'enregistrement de contrôle"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Impossible d'obtenir un curseur"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "A : Impossible de lire le contenu du répertoire %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "A : Impossible de statuer %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E : "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "A : "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E : des erreurs sont survenues sur le fichier "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Impossible de résoudre %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Échec du parcours de l'arbre"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Impossible d'ouvrir %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " Délier %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Impossible de lire le lien %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Impossible de délier %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Impossible de lier %s à %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Seuil de delink de %so atteint.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "L'archive ne possède pas de champ de paquet"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "%s ne possède pas d'entrée « override »\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr " le responsable de %s est %s et non %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s ne possède pas d'entrée « source override »\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s ne possède pas également pas d'entrée « binary override »\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Échec de l'allocation de mémoire"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Impossible d'ouvrir %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Impossible de lire le fichier d'« override » %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Entrée « override » %s mal formée %llu n° 2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Entrée « override » %s mal formée %llu n° 3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algorithme de compression « %s » inconnu"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "La sortie compressée %s a besoin d'un ensemble de compression"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Impossible de créer FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Échec du fork"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Fils compressé"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Erreur interne, impossible de créer %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Échec d'entrée/sortie du sous-processus sur le fichier"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Impossible de lire lors du calcul de la somme MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problème en déliant %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Utilisation: apt-internal-solver\n"
+"\n"
+"apt-internal-solver est une interface en ligne de commande\n"
+"permettant d'utiliser la résolution interne d'apt de manière externe\n"
+"avec les outils de la famille d'APT  à des fins de déboguage ou\n"
+"équivalent.\n"
+"\n"
+"Options:\n"
+"  -h  La présente aide.\n"
+"  -q  Affichage journalisable - pas de barre de progression\n"
+"  -c=? lecture du fichier de configuration indiqué\n"
+"  -o=? utilisation d'une option de configuration,\n"
+"       p. ex. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Enregistrement de paquet inconnu !"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Usage : apt-sortpkgs [options] fichier1 [fichier2 ...]\n"
+"\n"
+"apt-sortpkgs est un outil simple pour trier les paquets. L'option -s est\n"
+"employée pour indiquer le type de fichier dont il s'agit.\n"
+"\n"
+"Options :\n"
+"  -h   Ce texte d'aide\n"
+"  -s   Trie le fichier source\n"
+"  -c=? Lit ce fichier de configuration\n"
+"  -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/"
+"tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s n'est pas un paquet Debian valide."
 
diff --git a/po/gl.po b/po/gl.po
index 25e24dbcf..398421d88 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_gl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2011-05-12 15:28+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
@@ -22,154 +22,155 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Poedit-Language: Galician\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Número total de nomes de paquetes : "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Estruturas de paquetes totais: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Paquetes normais: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuais puros: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuais simples: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuais mixtos: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Non atopados: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Número total de versións distintas: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Número total de descricións distintas: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Número total de dependencias: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Número total de relacións versión/ficheiro: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Número total de relacións descrición/ficheiro: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Número total de asignacións provistas: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Número total de cadeas: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Espazo total de versións de dependencias: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Espazo de reserva total: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Espazo total contabilizado: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro de paquete %s está sen sincronizar."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Non se atopou ningún paquete"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Debe fornecer cando menos un patrón de busca"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Non foi posíbel atopar o paquete %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Ficheiros de paquetes:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Paquetes inmobilizados:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(non se atopou)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(ningún)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Inmobilizado: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Táboa de versións:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -243,28 +244,28 @@ msgstr ""
 "Vexa a páxina de manual apt-cache(8) e apt.conf(5) para obter mais "
 "información.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Forneza un nome para este disco, como «Debian 5.0.3 Disco 1»"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Insira un disco na unidade e prema Intro"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Produciuse un fallo ao montar «%s» en «%s»"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repita este proceso para o resto de CD do seu conxunto."
 
@@ -301,65 +302,65 @@ msgstr ""
 "  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Tome «%s» como paquete fonte no canto de «%s»\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Ignorar a versión non dispoñíbel «%s» do paquete «%s»"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Non foi posíbel atopar o paquete %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s cambiado a instalado manualmente.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s está estabelecido para a súa instalación automática.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Produciuse un erro interno, o solucionador interno estragou cousas"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Non é posíbel bloquear o directorio de descargas"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "Ten que especificar polo menos un paquete para obter o código fonte"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Non sé posíbel atopar un paquete fonte para %s"
@@ -385,97 +386,97 @@ msgstr ""
 "para obter as últimas actualizacións (posibelmente non publicadas) do "
 "paquete.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omítese o ficheiro xa descargado «%s»\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Non foi posíbel determinar o espazo libre en %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Non hai espazo libre abondo en %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Ten que recibir %sB de arquivos de fonte.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Non se puideron obter algúns arquivos."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Completouse a descarga no modo de só descargas"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallou a orde de desempaquetado «%s».\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallou a orde de construción de «%s».\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Ten que especificar polo menos un paquete para comprobarlle as dependencias "
 "de compilación"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Non é posíbel obter a información de dependencias de compilación de %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilación.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -484,7 +485,7 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -493,14 +494,14 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s "
 "é novo de máis"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -509,7 +510,7 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque ningunha versión "
 "dispoñíbel do paquete %s satisfai os requirimentos de versión"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -518,30 +519,30 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Non se puideron satisfacer as dependencias de construción de %s."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Non se puideron procesar as dependencias de construción"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Rexistro de cambios de %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Módulos admitidos:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -634,53 +635,74 @@ msgstr ""
 "para obter mais información e opcións\n"
 "                       Este APT ten poderes da Super Vaca.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Ten que especificar polo menos un paquete para obter o código fonte"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "mais non está instalado"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s cambiado a instalado manualmente.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s está estabelecido para a súa instalación automática.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s xa é a versión máis recente.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s xa é a versión máis recente.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Agardouse por %s pero non estaba alí"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s cambiado a instalado manualmente.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Non foi posíbel abrir %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -707,7 +729,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -755,52 +777,52 @@ msgstr "Non é posíbel desmontar o CD-ROM de %s, pode estarse empregando aínda
 msgid "Disk not found."
 msgstr "Non se atopou o disco"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Non se atopou o ficheiro"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Non foi posíbel determinar o estado"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Non foi posíbel estabelecer a hora de modificación"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI incorrecto, os URI locais non deben comezar por //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Identificándose"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Non é posíbel determinar o nome do outro extremo"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Non é posíbel determinar o nome local"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "O servidor rexeitou a conexión e dixo: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Fallou a orde USER, o servidor dixo: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Fallou a orde PASS, o servidor dixo: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -808,122 +830,124 @@ msgstr ""
 "Especificouse un servidor proxy pero non un script de conexión, Acquire::"
 "ftp::ProxyLogin está baleiro."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Fallou a orde do script de acceso «%s», o servidor dixo: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Fallou a orde TYPE, o servidor dixo: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Esgotouse o tempo para a conexión"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "O servidor pechou a conexión"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Produciuse un erro de lectura"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Unha resposta desbordou o búfer."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Dano no protocolo"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Produciuse un erro de escritura"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Non é posíbel crear un socket"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Non é posíbel conectar o socket de datos, o tempo esgotouse para a conexión"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Fallou"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Non é posíbel conectar o socket pasivo."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo non puido obter un socket no que atender"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Non é posíbel ligar un socket"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Non é posíbel escoitar no socket"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Non é posíbel determinar o nome do socket"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Non é posíbel enviar a orde PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Familia de enderezos %u (AF_*) descoñecida"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Produciuse un fallou na orde EPRT, o servidor dixo: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "A conexión do socket de datos esgotou o tempo"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Non é posíbel aceptar a conexión"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Xurdiu un problema ao calcular o hash do ficheiro"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Non é posíbel obter o ficheiro, o servidor dixo «%s»"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "O socket de datos esgotou o tempo"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Produciuse un fallou na transferencia de datos, o servidor dixo «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Petición"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Non é posíbel chamar a "
 
@@ -959,7 +983,7 @@ msgstr "Non foi posíbel conectar a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
@@ -989,40 +1013,40 @@ msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Non é posíbel conectar %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Sinatura correcta, pero non foi posíbel determinar a pegada "
 "dixital da chave"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Atopouse polo menos unha sinatura incorrecta."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Non é posíbel executar «gpgv» para verificar a sinatura (Está instalado "
 "gpgv?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Produciuse un erro descoñecido ao executar gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes sinaturas non eran correctas:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1030,152 +1054,386 @@ msgstr ""
 "Non se puideron verificar as seguintes sinaturas porque a chave pública non "
 "está dispoñíbel:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Os ficheiros baleiros non poden ser arquivadores válidos"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Produciuse un erro ao escribir no ficheiro"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Produciuse un erro ao ler do servidor. O extremo remoto pechou a conexión"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Produciuse un erro ao ler do servidor"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Produciuse un erro ao escribir nun ficheiro"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Fallou a chamada a select"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "A conexión esgotou o tempo"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Produciuse un erro ao escribir no ficheiro de saída"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Agardando polas cabeceiras"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Liña de cabeceira incorrecta"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou unha cabeceira de resposta incorrecta"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 "O servidor HTTP enviou unha cabeceira cunha lonxitude de contido incorrecta"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou unha cabeceira cun rango de contido incorrecto"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Formato de datos descoñecido"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Produciuse un fallo na conexión"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Produciuse un erro interno"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calculando a anovación... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Produciuse un erro interno, AllUpgrade estragou cousas"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Feito"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Corrixindo as dependencias..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " fallou."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Non foi posíbel corrixir as dependencias."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Non foi posíbel minimizar o conxunto de anovacións"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Feito"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Pode querer executar «apt-get -f install» para corrixilos."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencias incumpridas. Probe a empregar -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "mais %s está instalado"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mais vaise instalar %s"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "mais non é instalábel"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "mais é un paquete virtual"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "mais non está instalado"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "mais non se vai a instalar"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Os seguintes paquetes NOVOS hanse instalar:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Vanse RETIRAR os paquetes seguintes:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Consérvanse os seguintes paquetes:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Vanse anovar os paquetes seguintes:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Vanse REVERTER os seguintes paquetes :"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Vanse modificar os paquetes retidos seguintes:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por mor de %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISO: Retiraranse os seguintes paquetes esenciais.\n"
+"Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu anovados, %lu instalados, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu revertidos, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu non instalados ou retirados de todo.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Produciuse un erro na compilación da expresión regular - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "A orde «update» non toma argumentos"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Produciuse un erro interno, chamouse a InstallPackages con paquetes "
 "estragados."
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Hai que retirar paquetes mais o retirado está desactivado."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Produciuse un erro interno; non rematou a ordenación"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Que estraño... Os tamaños non coinciden; envíe un correo-e a apt@packages."
 "debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Ten que recibir %sB/%sB de arquivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Ten que recibir %sB de arquivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Despois desta operación ocuparanse %sB de disco adicionais.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Despois desta operación liberaranse %sB de espazo de disco.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Non hai espazo libre abondo en %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Xurdiron problemas e empregouse -y sen --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Especificouse «Só triviais» mais esta non é unha operación trivial."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Si, fai o que digo!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1186,19 +1444,19 @@ msgstr ""
 "Para continuar escriba a frase «%s»\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Interromper."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Quere continuar?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Non foi posíbel descargar algúns ficheiros"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1206,20 +1464,20 @@ msgstr ""
 "Non foi posíbel obter algúns arquivos; probe con apt-get update ou --fix-"
 "missing."
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "O emprego conxunto de --fix-missing e intercambio de discos non está admitido"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Non é posíbel corrixir os paquetes non dispoñíbeis."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Interrompendo a instalación."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1233,17 +1491,17 @@ msgstr[1] ""
 "Os seguintes paquetes desapareceron do seu sistema e todos os \n"
 "ficheiros serán sobrescritos por outros paquetes:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: Isto será feito automaticamente por dpkg."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Non se agarda que eliminemos cousas, non se pode iniciar o Retirado "
 "automático"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1261,15 +1519,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte información pode axudar a solucionar a situación:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Produciuse un erro interno, o Retirado automático estragou cousas"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1281,7 +1539,7 @@ msgstr[1] ""
 "Os seguintes paquetes foron instalados automaticamente e xa non son "
 "necesarios:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1290,18 +1548,18 @@ msgstr[0] "%lu paquete foi instalado automaticamente e xa non é necesario.\n"
 msgstr[1] ""
 "%lu paquetes foron instalados automaticamente e xa non son necesarios.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Empregue «apt-get autoremove» para eliminalos."
 msgstr[1] "Empregue «apt-get autoremove» para eliminalos."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Pode querer executar «apt-get -f install» para corrixir isto:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1309,7 +1567,7 @@ msgstr ""
 "Dependencias incumpridas. Probe «apt-get -f install» sen paquetes (ou "
 "especifique unha solución)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1322,323 +1580,97 @@ msgstr ""
 "algúns paquetes solicitados aínda non se creasen ou que se movesen da "
 "entrada."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Paquetes estragados"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Instalaranse os seguintes paquetes extra:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Paquetes suxeridos:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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: Isto é só unha simulación!\n"
+"      apt-get precisa de privilexios de administrador para executarse "
+"realmente.\n"
+"      Lembre tamén que o bloqueo está desactivado,\n"
+"      polo que non debe depender da relevancia da situación actual real."
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Ignórase o aviso de autenticación.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Non foi posíbel autenticar algúns paquetes"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Instalar estes paquetes sen verificación?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Non foi posíbel obter %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "mais %s está instalado"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mais vaise instalar %s"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "mais non é instalábel"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "mais é un paquete virtual"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "mais non está instalado"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "mais non se vai a instalar"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Os seguintes paquetes NOVOS hanse instalar:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Vanse RETIRAR os paquetes seguintes:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Consérvanse os seguintes paquetes:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Vanse anovar os paquetes seguintes:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Vanse REVERTER os seguintes paquetes :"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Vanse modificar os paquetes retidos seguintes:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (por mor de %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISO: Retiraranse os seguintes paquetes esenciais.\n"
-"Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu anovados, %lu instalados, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu revertidos, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu non instalados ou retirados de todo.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Produciuse un erro na compilación da expresión regular - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Corrixindo as dependencias..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " fallou."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Non foi posíbel corrixir as dependencias."
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Non foi posíbel minimizar o conxunto de anovacións"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Pode querer executar «apt-get -f install» para corrixilos."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencias incumpridas. Probe a empregar -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "A orde «update» non toma argumentos"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Calculando a anovación... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Produciuse un erro interno, AllUpgrade estragou cousas"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Feito"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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: Isto é só unha simulación!\n"
-"      apt-get precisa de privilexios de administrador para executarse "
-"realmente.\n"
-"      Lembre tamén que o bloqueo está desactivado,\n"
-"      polo que non debe depender da relevancia da situación actual real."
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Non foi posíbel cambiar o nome de %s a %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Teño "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Rcb:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Obtivéronse %sB en %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Traballando]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1651,19 +1683,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Non é posíbel ler %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Non é posíbel cambiar a %s"
@@ -1692,11 +1724,11 @@ msgstr "Non é posíbel ler o ficheiro de replica «%s»"
 msgid "[Mirror: %s]"
 msgstr "[Replica: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Non foi posíbel crear a canle IPC ao subproceso"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "A conexión pechouse prematuramente"
 
@@ -1737,1344 +1769,452 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Mesturando a información sobre paquetes dispoñíbeis"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Uso: apt-extracttemplates fich1 [fich2 ...]\n"
-"\n"
-"apt-extracttemplates é unha ferramenta para extraer información\n"
-"de configuración e patróns dos paquetes debian\n"
-"\n"
-"Opcións:\n"
-"  -h   Este texto de axuda\n"
-"  -t   Estabelece o directorio temporal\n"
-"  -c=? Le este ficheiro de configuración\n"
-"  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Non é posíbel escribir en %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "A lista de extensións de paquetes é longa de máis"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Produciuse un erro ao procesar o directorio %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "A lista de extensións de fontes é longa de máis"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Produciuse un erro ao procesar o contido %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Emprego: apt-ftparchive [opcións] orde\n"
-"Ordes: packages rutabinaria [fichoverride [prefixoruta]]\n"
-"       sources rutafontes [fichoverride [prefixoruta]]\n"
-"       contents ruta\n"
-"       release ruta\n"
-"       generate config [grupos]\n"
-"       clean config\n"
-"\n"
-"apt-ftparchive xera ficheiros de índices para arquivos de Debian. Admite\n"
-"varios estilos de xeración, de totalmente automática a substitutos "
-"funcionais\n"
-"de dpkg-scanpackages e dpkg-scansources\n"
-"\n"
-"apt-ftparchive xera ficheiros Packages dunha árbore de .debs. O ficheiro\n"
-"Packages ten o contido de todos os campos de control de cada paquete, así\n"
-"coma a suma MD5 e o tamaño do ficheiro. Admitese un ficheiro de «overrides»\n"
-"para forzar o valor dos campos Priority e Section.\n"
-"\n"
-"De xeito semellante, apt-ftparchive xera ficheiros Sources dunha árbore de\n"
-".dscs. Pódese empregar a opción --source-override para especificar un "
-"ficheiro\n"
-"de «overrides» para fontes.\n"
-"\n"
-"As ordes «packages» e «sources» deberían executarse na raíz da árbore.\n"
-"«Rutabinaria» debería apuntar á base da busca recursiva e o ficheiro\n"
-"«fichoverride» debería conter os modificadores de «override». «Prefixoruta»\n"
-"engádese aos campos de nomes de ficheiros se está presente. Un exemplo\n"
-"de emprego do arquivo de Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opcións:\n"
-"  -h    Este texto de axuda\n"
-"  --md5 Controla a xeración de MD5\n"
-"  -s=?  Ficheiro de «override» de fontes\n"
-"  -q    Non produce ningunha saída por pantalla\n"
-"  -d=?  Escolle a base de datos de caché opcional\n"
-"  --no-delink Activa o modo de depuración de desligado\n"
-"  --contents  Controla a xeración do ficheiro de contido\n"
-"  -c=?  Le este ficheiro de configuración\n"
-"  -o=?  Estabelece unha opción de configuración"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Non coincide ningunha selección"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "A base de datos estaba danada, cambiouse o nome do ficheiro a %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "A base de datos é antiga, tentando anovar %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"O formato da base de datos non é correcto. Se a anovou desde unha versión "
-"antiga de apt, retirea e volva a crear a base de datos"
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Non é posíbel abrir o ficheiro de base de datos %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Non foi posíbel determinar o estado %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "O arquivo non ten un rexistro de control"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Non é posíbel obter un cursor"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: non é posíbel ler o directorio %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: non é posíbel atopar %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "A: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: os erros aplícanse ao ficheiro "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Non foi posíbel solucionar %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Fallou o percorrido da árbore"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Non foi posíbel abrir %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DesLig %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Non foi posíbel ler a ligazón %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Non foi posíbel desligar %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Non foi posíbel ligar %s con %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Acadouse o límite de desligado de %sB.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "O arquivo non tiña un campo Package"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s non ten unha entrada de «override»\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  O mantedor de %s é %s, non %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s non ten unha entrada de «override» de código fonte\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s tampouco ten unha entrada de «override» de binarios\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Non foi posíbel reservar memoria"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Non é posíbel puido abrir %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "«Override» %s liña %lu incorrecta (1)"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Non foi posíbel ler o ficheiro de «override» %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "«Override» %s liña %lu incorrecta (1)"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "«Override» %s liña %lu incorrecta (2)"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "«Override» %s liña %lu incorrecta (3)"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo de compresión «%s» descoñecido"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "A saída comprimida %s precisa dun conxunto de compresión"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Non foi posíbel crear o FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Non foi posíbel facer a bifurcación"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Fillo de compresión"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Produciuse un erro interno, non foi posíbel crear %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Produciuse un fallo na E/S do subproceso/ficheiro"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Non foi posíbel ler ao calcular o MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Xurdiu un problema ao desligar %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Non foi posíbel cambiar o nome de %s a %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-extracttemplates fich1 [fich2 ...]\n"
-"\n"
-"apt-extracttemplates é unha ferramenta para extraer información\n"
-"de configuración e patróns dos paquetes debian\n"
-"\n"
-"Opcións:\n"
-"  -h   Este texto de axuda\n"
-"  -t   Estabelece o directorio temporal\n"
-"  -c=? Le este ficheiro de configuración\n"
-"  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Rexistro de paquete descoñecido!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Emprego: apt-sortpkgs [opcións] fich1 [fich2 ...]\n"
-"\n"
-"apt-sortpkgs é unha ferramenta simple para ordenar ficheiros de paquetes.\n"
-"A opción -s emprégase para indicar o tipo de ficheiro que é.\n"
-"\n"
-"Opcións:\n"
-"  -h   Este texto de axuda\n"
-"  -s   Emprega ordenamento por ficheiros fonte\n"
-"  -c=? Le este ficheiro de configuración\n"
-"  -o=? Estabelece unha opción de configuración; por exemplo, -o dir::cache=/"
-"tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Non foi posíbel crear as canles"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Non foi posíbel executar gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Arquivo danado"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "A suma de comprobación do arquivo tar non coincide, está danado"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Sinatura de arquivo incorrecta"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Produciuse un erro ao ler a cabeceira do membro do arquivo"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Cabeceira do membro do arquivo incorrecta %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Cabeceira do membro do arquivo incorrecta"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "O arquivo é curto de máis"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Non foi posíbel ler as cabeceiras dos arquivos"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "Chamouse a DropNode nun nodo aínda ligado"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Non foi posíbel atopar o elemento hash"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Non foi posíbel reservar un desvío"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Produciuse un erro interno en AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Téntase sobrescribir un desvío, %s -> %s e %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Desvío %s -> %s engadido dúas veces"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Ficheiro de configuración %s/%s duplicado"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Non foi posíbel escribir no ficheiro «%s»"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Non foi posíbel pechar o ficheiro %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "A ruta %s é longa de máis"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Desempaquetando %s máis dunha vez"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "O directorio %s está desviado"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "O paquete tenta escribir no destino do desvío %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "A ruta do desvío é longa de máis"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Non foi posíbel determinar o estado %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Non foi posíbel cambiar o nome de %s a %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "O directorio %s estase a substituír por algo que non é un directorio"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Non foi posíbel atopar o nodo no seu contedor hash"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "A ruta é longa de máis"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Coincidencia na sobrescritura sen versión para %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Non é posíbel determinar o estado %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Non foi posíbel escribir no ficheiro «%s»"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Non foi posíbel pechar o ficheiro %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Este non é un arquivo DEB correcto, falta o membro «%s»"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Produciuse un erro interno, non foi posíbel atopar o membro %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Ficheiro de control non analizábel"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Non é posíbel facer mmap sobre un ficheiro baleiro"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Non foi posíbel duplicar o descritor de ficheiro %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Non foi posíbel facer mmap de %lu bytes"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Non é posíbel pechar mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Non é posíbel sincronizar mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Non foi posíbel facer mmap de %lu bytes"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Non foi posíbel truncar o ficheiro"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-"
-"Start. O valor actual é : %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Non é posíbel aumentar o tamaño de MMap xa que o límite de %lu bytes xa foi "
-"acadado."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Non é posíbel aumentar o tamaño de MMap xa que o crecemento automático foi "
-"desactivado polo usuario."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Non se atopou a selección %s"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Abreviatura de tipo «%c» descoñecida"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Abrindo o ficheiro de configuración %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Produciuse un erro de sintaxe %s:%u: O bloque comeza sen un nome."
-
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Produciuse un erro de sintaxe %s:%u: Etiqueta mal formada"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Produciuse un erro de sintaxe %s:%u: Lixo extra despois do valor"
-
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-"Produciuse un erro de sintaxe %s:%u: Só se poden facer directivas no nivel "
-"superior"
-
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Produciuse un erro de sintaxe %s:%u: Includes aniñados de máis"
-
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Produciuse un erro de sintaxe %s:%u: Incluído de aquí"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Sinatura de arquivo incorrecta"
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Produciuse un erro de sintaxe %s:%u: Non se admite a directiva «%s»"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Produciuse un erro ao ler a cabeceira do membro do arquivo"
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Produciuse un erro de sintaxe %s:%u: a directiva «clear» require unha árbore "
-"de opción como argumento"
+msgid "Invalid archive member header %s"
+msgstr "Cabeceira do membro do arquivo incorrecta %s"
 
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Produciuse un erro de sintaxe %s:%u: Lixo extra á fin da liña"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Cabeceira do membro do arquivo incorrecta"
 
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Erro!"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "O arquivo é curto de máis"
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Feito"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Non foi posíbel ler as cabeceiras dos arquivos"
 
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Non foi posíbel crear as canles"
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Feito"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Non foi posíbel executar gzip "
 
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Non se coñece a opción de liña de ordes «%c» [de %s]."
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Arquivo danado"
 
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Non se entende a opción de liña de ordes %s"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "A suma de comprobación do arquivo tar non coincide, está danado"
 
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "A opción de liña de ordes %s non é booleana"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s"
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "A opción %s precisa dun argumento."
+msgid "Unable to stat %s."
+msgstr "Non é posíbel analizar %s."
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Opción %s: A especificación de elemento de configuración debe ter un =<val>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "A opción %s precisa dun argumento enteiro, non «%s»"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "A opción «%s» é longa de máis"
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "O senso %s non se entende, probe «true» ou «false»."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Operación incorrecta: %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Non é posíbel analizar o punto de montaxe %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Non foi posíbel analizar o CD-ROM"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Produciuse un problema ao pechar o arquivo gzip %s"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Non foi posíbel abrir o ficheiro de bloqueo %s"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Executando dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s"
+msgid "Packaging system '%s' is not supported"
+msgstr "O sistema de empaquetado «%s» non está admitido"
 
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Non foi posíbel obter o bloqueo %s"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Non é posíbel determinar un tipo de sistema de empaquetado axeitado"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "A lista de ficheiros non pode ser creada como «%s» non é un directorio"
+msgid "Wrote %i records.\n"
+msgstr "Escribíronse %i rexistros.\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Ignorando «%s» no directorio «%s» xa que non é un ficheiro regular"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-"Ignorando o ficheiro «%s» no directorio «%s» xa que non ten extensión de nome"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"Ignorando o ficheiro «%s» no directorio «%s» xa que ten  unha extensión de "
-"nome incorrecta"
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "O subproceso %s recibiu un fallo de segmento."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "O subproceso %s recibiu o sinal %u."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "O subproceso %s devolveu un código de erro (%u)"
+"Escribíronse %i rexistros con %i ficheiros que faltan e %i ficheiros que non "
+"coinciden\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "O subproceso %s saíu de xeito inesperado"
+msgid "Can't find authentication record for: %s"
+msgstr "Non é posíbel atopar un rexistro de autenticación para: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file %s"
-msgstr "Non foi posíbel abrir o ficheiro %s"
+msgid "Hash mismatch for: %s"
+msgstr "Valor de hash non coincidente para: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Non foi posíbel abrir o descritor de ficheiro %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Non foi posíbel crear o IPC do subproceso"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Non foi posíbel executar o compresor "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
+msgid "The method driver %s could not be found."
+msgstr "Non foi posíbel atopar o controlador de métodos %s."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "escritura, aínda hai %lu para escribir pero non se puido"
+msgid "Is the package %s installed?"
+msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "Produciuse un problema ao pechar o ficheiro %s"
+msgid "Method %s did not start correctly"
+msgstr "O método %s non se iniciou correctamente"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Produciuse un problema ao renomear o ficheiro %s a %s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro."
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Produciuse un problema ao desligar o ficheiro %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"Non foi posíbel analizar ou abrir as listas de paquetes ou ficheiro de "
+"estado."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Produciuse un problema ao sincronizar o ficheiro"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Pode querer executar «apt-get update» para corrixir estes problemas"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Non ha ningún chaveiro instalado en %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Non foi posíbel ler a lista de orixes."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Caché de paquetes baleira"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "O ficheiro de caché de paquetes está danado"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "O ficheiro de caché de paquetes é unha versión incompatíbel"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "O ficheiro de caché de paquetes está danado"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Este APT non admite o sistema de versionado «%s»"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "A caché de paquetes construíuse para unha arquitectura diferente"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "PreDepende"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Suxire"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Conflitos"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Substitúe a"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Fai obsoleto a"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Estraga"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Mellora"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "requirido"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Construindo a árbore de dependencias"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Versións candidatas"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Xeración de dependencias"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Lendo a información do estado"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Non foi posíbel abrir o ficheiro de estado %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Liña %lu mal construída na lista de orixes %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Liña %lu mal construída na lista de orixes %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Abrindo %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Liña %u longa de máis na lista de orixes %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Non foi posíbel facer a configuración inmediata en «%s». Vexa man 5 apt.conf "
-"baixo APT::Immediate-Configure para obter máis detalles. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Non foi posíbel abrir o ficheiro «%s»"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 instalación requirirá que se retire temporalmente o paquete esencial %s "
-"por mor dun bucle de Conflitos e Pre-dependencias. Isto adoita ser malo, "
-"pero se o quere facer, active a opción APT::Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "O tipo de ficheiros de índices «%s» non está admitido"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu "
-"arquivo."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar "
-"causado por paquetes retidos."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Non se atopa a lista de directorios %sparcial."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Non se atopa a lista de arquivos %sparcial."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Non é posíbel bloquear o directorio %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Obtendo o ficheiro %li de %li (restan %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Obtendo o ficheiro %li de %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Non foi posíbel atopar o controlador de métodos %s."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "O método %s non se iniciou correctamente"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro."
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "O sistema de empaquetado «%s» non está admitido"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Non é posíbel determinar un tipo de sistema de empaquetado axeitado"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Non é posíbel analizar %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Non foi posíbel analizar ou abrir as listas de paquetes ou ficheiro de "
-"estado."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Non foi posíbel ler a lista de orixes."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-"Rexistro incorrecto no ficheiro de preferencias %s; falta a cabeceira Package"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Non se entendeu o tipo de inmobilización %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr ""
-"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "A caché ten un sistema de versionado incompatíbel"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Produciuse un erro ao procesar %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Vaites!, superou o número de nomes de paquetes que este APT pode manexar."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Vaites!, superou o número de versións que este APT pode manexar."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Vaites!, superou o número de descricións que este APT pode manexar."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Vaites!, superou o número de dependencias que este APT pode manexar."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Non foi posíbel atopar o paquete %s %s ao procesar as dependencias de "
 "ficheiros"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Non foi posíbel atopar a lista de paquetes fonte %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Lendo as listas de paquetes"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Recollendo as provisións de ficheiros"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Non é posíbel escribir en %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Produciuse un erro de E/S ao gravar a caché de fontes"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "A sumas «hash» non coinciden"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Os tamaños non coinciden"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operación incorrecta: %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3083,29 +2223,29 @@ msgstr ""
 "Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación "
 "(entrada sources.list incorrecta ou ficheiro con formato incorrecto)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr ""
 "Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3116,12 +2256,12 @@ msgstr ""
 "%s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Produciuse un erro de GPG: %s %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3130,12 +2270,12 @@ msgstr ""
 "Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
 "ten que arranxar este paquete a man. (Falta a arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3143,71 +2283,135 @@ msgstr ""
 "Os ficheiros de índices de paquetes están danados. Non hai un campo "
 "Filename: para o paquete %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Non se puido analizar o ficheiro de publicación %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "O bloque de provedor %s non contén unha pegada dixital"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Non hai seccións no ficheiro de publicación %s"
+msgid "List directory %spartial is missing."
+msgstr "Non se atopa a lista de directorios %sparcial."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Non hai entrada de Hash no ficheiro de publicación %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Non se atopa a lista de arquivos %sparcial."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "A entrada «Valid-Until» no ficheiro de publicación %s non é válida"
+msgid "Unable to lock directory %s"
+msgstr "Non é posíbel bloquear o directorio %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Obtendo o ficheiro %li de %li (restan %s)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "O bloque de provedor %s non contén unha pegada dixital"
+msgid "Retrieving file %li of %li"
+msgstr "Obtendo o ficheiro %li de %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Algúns ficheiros de índice fallaron durante a descarga. Ignoráronse, ou "
+"foron utilizados algúns antigos no seu lugar"
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
+"Rexistro incorrecto no ficheiro de preferencias %s; falta a cabeceira Package"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Non se entendeu o tipo de inmobilización %s"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr ""
+"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Non foi posíbel facer a configuración inmediata en «%s». Vexa man 5 apt.conf "
+"baixo APT::Immediate-Configure para obter máis detalles. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Non foi posíbel abrir o ficheiro «%s»"
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 instalación requirirá que se retire temporalmente o paquete esencial %s "
+"por mor dun bucle de Conflitos e Pre-dependencias. Isto adoita ser malo, "
+"pero se o quere facer, active a opción APT::Force-LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Liña %u longa de máis na lista de orixes %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Desmontando o CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Empregando o punto de montaxe de CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Desmontando o CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Agardando polo disco...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Montando o CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Identificando... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etiqueta almacenada: %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Desmontando o CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "Buscando os ficheiros de índices no disco..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "Buscando os ficheiros de índices no disco...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3216,7 +2420,7 @@ msgstr ""
 "Atopáronse %zu índices de paquetes, %zu índices de orixes, %zu índices de "
 "traducións e %zu sinaturas\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3224,16 +2428,16 @@ msgstr ""
 "Non é posíbel localizar ningún ficheiro de paquetes. É posíbel que non sexa "
 "un disco de Debian ou que a arquitectura sexa incorrecta."
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Atopouse a etiqueta «%s»\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Ese non é un nome correcto, volva tentalo.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3242,83 +2446,107 @@ msgstr ""
 "Este disco chámase: \n"
 "«%s»\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Copiando as listas de paquetes..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Escribindo a nova lista de orixes\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "As entradas da lista de orixes deste disco son:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Escribíronse %i rexistros.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu "
+"arquivo."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar "
+"causado por paquetes retidos."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo a árbore de dependencias"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versións candidatas"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Xeración de dependencias"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lendo a información do estado"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n"
+msgid "Failed to open StateFile %s"
+msgstr "Non foi posíbel abrir o ficheiro de estado %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"Escribíronse %i rexistros con %i ficheiros que faltan e %i ficheiros que non "
-"coinciden\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Non é posíbel atopar un rexistro de autenticación para: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Valor de hash non coincidente para: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Non se atopou a publicación «%s» de «%s»"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Non se atopou a versión «%s» de «%s»"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Non foi posíbel atopar a tarefa «%s»"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Non é posíbel seleccionar distintas versións do paquete «%s» xa que é "
 "puramente virtual"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3327,179 +2555,245 @@ msgstr ""
 "Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete "
 "«%s» xa que non ten ningunha delas"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é "
 "puramente virtual"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Non é posíbel seleccionar a versión candidata do paquete %s xa que non ten "
 "candidata"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Non é posíbel seleccionar a versión instalada do paquete %s xa que non está "
 "instalado"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Non se puido analizar o ficheiro de publicación %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Non hai seccións no ficheiro de publicación %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Non hai entrada de Hash no ficheiro de publicación %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "A entrada «Valid-Until» no ficheiro de publicación %s non é válida"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
+
+#: apt-pkg/sourcelist.cc:170
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
+"Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
+"Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Executando dpkg"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Algúns ficheiros de índice fallaron durante a descarga. Ignoráronse, ou "
-"foron utilizados algúns antigos no seu lugar"
+"Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Liña %lu mal construída na lista de orixes %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Liña %lu mal construída na lista de orixes %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Abrindo %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Retirando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s completamente retirado"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Tomando nota da desaparición de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Executando o disparador de post-instalación %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directorio «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Non foi posíbel abrir o ficheiro «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparandose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Instalouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparándose para o retirado de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Retirouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparándose para retirar %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Retirouse %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Non é posíbel escribir en %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Non se escribiu ningún informe de Apport porque xa se acadou o nivel "
 "MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - déixase sen configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3507,7 +2801,7 @@ msgstr ""
 "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que "
 "é un error provinte dun fallo anterior."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3515,7 +2809,7 @@ msgstr ""
 "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
 "erro de disco cheo."
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3523,7 +2817,7 @@ msgstr ""
 "Non se escribiu un informe de contribución porque a mensaxe de erro indica "
 "un erro de falta de memoria"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3532,14 +2826,14 @@ msgstr ""
 "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
 "erro de disco cheo."
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
 "erro de E/S en dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3548,7 +2842,7 @@ msgstr ""
 "Non é posíbel bloquear o directorio de administración (%s). Esta usandoo "
 "algún outro proceso?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3557,17 +2851,756 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg interrompeuse, debe executar manualmente «%s» para corrixir o problema. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Non está bloqueado"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Non se atopou a selección %s"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Non foi posíbel abrir o ficheiro de bloqueo %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Non foi posíbel obter o bloqueo %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "A lista de ficheiros non pode ser creada como «%s» non é un directorio"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "Ignorando «%s» no directorio «%s» xa que non é un ficheiro regular"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+"Ignorando o ficheiro «%s» no directorio «%s» xa que non ten extensión de nome"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"Ignorando o ficheiro «%s» no directorio «%s» xa que ten  unha extensión de "
+"nome incorrecta"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "O subproceso %s recibiu un fallo de segmento."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "O subproceso %s recibiu o sinal %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "O subproceso %s saíu de xeito inesperado"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Produciuse un problema ao pechar o arquivo gzip %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Non foi posíbel abrir o ficheiro %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Non foi posíbel abrir o descritor de ficheiro %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Non foi posíbel crear o IPC do subproceso"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Non foi posíbel executar o compresor "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "escritura, aínda hai %lu para escribir pero non se puido"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Produciuse un problema ao pechar o ficheiro %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Produciuse un problema ao renomear o ficheiro %s a %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Produciuse un problema ao desligar o ficheiro %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Produciuse un problema ao sincronizar o ficheiro"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Erro!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Feito"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Feito"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Non é posíbel facer mmap sobre un ficheiro baleiro"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Non foi posíbel duplicar o descritor de ficheiro %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Non foi posíbel facer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Non é posíbel pechar mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Non é posíbel sincronizar mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Non foi posíbel facer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Non foi posíbel truncar o ficheiro"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-"
+"Start. O valor actual é : %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Non é posíbel aumentar o tamaño de MMap xa que o límite de %lu bytes xa foi "
+"acadado."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Non é posíbel aumentar o tamaño de MMap xa que o crecemento automático foi "
+"desactivado polo usuario."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Non é posíbel analizar o punto de montaxe %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Non foi posíbel analizar o CD-ROM"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Abreviatura de tipo «%c» descoñecida"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Abrindo o ficheiro de configuración %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Produciuse un erro de sintaxe %s:%u: O bloque comeza sen un nome."
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Produciuse un erro de sintaxe %s:%u: Etiqueta mal formada"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Produciuse un erro de sintaxe %s:%u: Lixo extra despois do valor"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Produciuse un erro de sintaxe %s:%u: Só se poden facer directivas no nivel "
+"superior"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Produciuse un erro de sintaxe %s:%u: Includes aniñados de máis"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Produciuse un erro de sintaxe %s:%u: Incluído de aquí"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Produciuse un erro de sintaxe %s:%u: Non se admite a directiva «%s»"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Produciuse un erro de sintaxe %s:%u: a directiva «clear» require unha árbore "
+"de opción como argumento"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Produciuse un erro de sintaxe %s:%u: Lixo extra á fin da liña"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Non ha ningún chaveiro instalado en %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Non se coñece a opción de liña de ordes «%c» [de %s]."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Non se entende a opción de liña de ordes %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "A opción de liña de ordes %s non é booleana"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "A opción %s precisa dun argumento."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"Opción %s: A especificación de elemento de configuración debe ter un =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "A opción %s precisa dun argumento enteiro, non «%s»"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "A opción «%s» é longa de máis"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "O senso %s non se entende, probe «true» ou «false»."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Operación incorrecta: %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Uso: apt-extracttemplates fich1 [fich2 ...]\n"
+"\n"
+"apt-extracttemplates é unha ferramenta para extraer información\n"
+"de configuración e patróns dos paquetes debian\n"
+"\n"
+"Opcións:\n"
+"  -h   Este texto de axuda\n"
+"  -t   Estabelece o directorio temporal\n"
+"  -c=? Le este ficheiro de configuración\n"
+"  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Non é posíbel determinar o estado %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "A lista de extensións de paquetes é longa de máis"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Produciuse un erro ao procesar o directorio %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "A lista de extensións de fontes é longa de máis"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Produciuse un erro ao procesar o contido %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Emprego: apt-ftparchive [opcións] orde\n"
+"Ordes: packages rutabinaria [fichoverride [prefixoruta]]\n"
+"       sources rutafontes [fichoverride [prefixoruta]]\n"
+"       contents ruta\n"
+"       release ruta\n"
+"       generate config [grupos]\n"
+"       clean config\n"
+"\n"
+"apt-ftparchive xera ficheiros de índices para arquivos de Debian. Admite\n"
+"varios estilos de xeración, de totalmente automática a substitutos "
+"funcionais\n"
+"de dpkg-scanpackages e dpkg-scansources\n"
+"\n"
+"apt-ftparchive xera ficheiros Packages dunha árbore de .debs. O ficheiro\n"
+"Packages ten o contido de todos os campos de control de cada paquete, así\n"
+"coma a suma MD5 e o tamaño do ficheiro. Admitese un ficheiro de «overrides»\n"
+"para forzar o valor dos campos Priority e Section.\n"
+"\n"
+"De xeito semellante, apt-ftparchive xera ficheiros Sources dunha árbore de\n"
+".dscs. Pódese empregar a opción --source-override para especificar un "
+"ficheiro\n"
+"de «overrides» para fontes.\n"
+"\n"
+"As ordes «packages» e «sources» deberían executarse na raíz da árbore.\n"
+"«Rutabinaria» debería apuntar á base da busca recursiva e o ficheiro\n"
+"«fichoverride» debería conter os modificadores de «override». «Prefixoruta»\n"
+"engádese aos campos de nomes de ficheiros se está presente. Un exemplo\n"
+"de emprego do arquivo de Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opcións:\n"
+"  -h    Este texto de axuda\n"
+"  --md5 Controla a xeración de MD5\n"
+"  -s=?  Ficheiro de «override» de fontes\n"
+"  -q    Non produce ningunha saída por pantalla\n"
+"  -d=?  Escolle a base de datos de caché opcional\n"
+"  --no-delink Activa o modo de depuración de desligado\n"
+"  --contents  Controla a xeración do ficheiro de contido\n"
+"  -c=?  Le este ficheiro de configuración\n"
+"  -o=?  Estabelece unha opción de configuración"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Non coincide ningunha selección"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "A base de datos estaba danada, cambiouse o nome do ficheiro a %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "A base de datos é antiga, tentando anovar %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"O formato da base de datos non é correcto. Se a anovou desde unha versión "
+"antiga de apt, retirea e volva a crear a base de datos"
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Non é posíbel abrir o ficheiro de base de datos %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "O arquivo non ten un rexistro de control"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Non é posíbel obter un cursor"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "A: non é posíbel ler o directorio %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "A: non é posíbel atopar %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "A: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: os erros aplícanse ao ficheiro "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Non foi posíbel solucionar %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Fallou o percorrido da árbore"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Non foi posíbel abrir %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DesLig %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Non foi posíbel ler a ligazón %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Non foi posíbel desligar %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Non foi posíbel ligar %s con %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Acadouse o límite de desligado de %sB.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "O arquivo non tiña un campo Package"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s non ten unha entrada de «override»\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  O mantedor de %s é %s, non %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s non ten unha entrada de «override» de código fonte\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s tampouco ten unha entrada de «override» de binarios\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Non foi posíbel reservar memoria"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Non é posíbel puido abrir %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "«Override» %s liña %lu incorrecta (1)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Non foi posíbel ler o ficheiro de «override» %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "«Override» %s liña %lu incorrecta (1)"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "«Override» %s liña %lu incorrecta (2)"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "«Override» %s liña %lu incorrecta (3)"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmo de compresión «%s» descoñecido"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "A saída comprimida %s precisa dun conxunto de compresión"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Non foi posíbel crear o FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Non foi posíbel facer a bifurcación"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Fillo de compresión"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Produciuse un erro interno, non foi posíbel crear %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Produciuse un fallo na E/S do subproceso/ficheiro"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Non foi posíbel ler ao calcular o MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Xurdiu un problema ao desligar %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-extracttemplates fich1 [fich2 ...]\n"
+"\n"
+"apt-extracttemplates é unha ferramenta para extraer información\n"
+"de configuración e patróns dos paquetes debian\n"
+"\n"
+"Opcións:\n"
+"  -h   Este texto de axuda\n"
+"  -t   Estabelece o directorio temporal\n"
+"  -c=? Le este ficheiro de configuración\n"
+"  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Rexistro de paquete descoñecido!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Emprego: apt-sortpkgs [opcións] fich1 [fich2 ...]\n"
+"\n"
+"apt-sortpkgs é unha ferramenta simple para ordenar ficheiros de paquetes.\n"
+"A opción -s emprégase para indicar o tipo de ficheiro que é.\n"
+"\n"
+"Opcións:\n"
+"  -h   Este texto de axuda\n"
+"  -s   Emprega ordenamento por ficheiros fonte\n"
+"  -c=? Le este ficheiro de configuración\n"
+"  -o=? Estabelece unha opción de configuración; por exemplo, -o dir::cache=/"
+"tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s non é un paquete DEB válido."
 
diff --git a/po/he.po b/po/he.po
index a2e3cba60..b70ae3b34 100644
--- a/po/he.po
+++ b/po/he.po
@@ -717,7 +717,7 @@ msgid "The list of sources could not be read."
 msgstr "רשימת המקורות לא ניתנת לקריאה."
 
 #: cmdline/apt-get.cc:836
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
 #: cmdline/apt-get.cc:841
@@ -2604,7 +2604,7 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
-msgid "Identifying.. "
+msgid "Identifying... "
 msgstr ""
 
 #: apt-pkg/cdrom.cc:559
@@ -2621,10 +2621,6 @@ msgstr ""
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:603
-msgid "Unmounting CD-ROM\n"
-msgstr ""
-
 #: apt-pkg/cdrom.cc:607
 msgid "Waiting for disc...\n"
 msgstr ""
@@ -2635,7 +2631,7 @@ msgid "Mounting CD-ROM...\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:633
-msgid "Scanning disc for index files..\n"
+msgid "Scanning disc for index files...\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:673
diff --git a/po/hu.po b/po/hu.po
index d15ab8b6b..752ee046b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt trunk\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2012-06-25 17:09+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -21,153 +21,154 @@ msgstr ""
 "X-Poedit-Country: HUNGARY\n"
 "X-Poedit-Language: Hungarian\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Csomagnevek összesen : "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Csomagstruktúrák összesen: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Normális csomagok: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Teljesen virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Egyedi virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Vegyes virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Hiányzik: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Különböző verziók összesen: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Összes különböző leírás: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Függőségek összesen: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Verzió/Fájl kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Leírás/Fájl kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "„Biztosítja” kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Minták összesen: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Függőségiverzió-terület összesen: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Slack terület összesen: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Nyilvántartott terület összesen: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "%s csomagfájl nincs szinkronban."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Nem találhatók csomagok"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Legalább egy keresési mintát meg kell adnia"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Ez a parancs elavult. Használja helyette az „apt-mark showauto”-t."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ez a csomag nem található: %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Csomagfájlok:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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 csomagfájlra"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Rögzített csomagok:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(nem található)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Telepítve: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Jelölt: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(nincs)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Csomagrögzítés: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Verziótáblázat:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s erre: %s lefordítva ekkor: %s %s\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -238,28 +239,28 @@ msgstr ""
 "Lásd az apt-cache(8) és apt.conf(5) kézikönyvlapokat további "
 "információkért.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Adja meg a lemez nevét, mint például „Debian 5.0.3 1. lemez”"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Helyezzen be egy lemezt a meghajtóba, és nyomja meg az Entert"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "„%s” csatolása a(z) „%s” könyvtárba meghiúsult"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ismételje meg a folyamatot készlete többi CD-jével is."
 
@@ -294,48 +295,48 @@ msgstr ""
 "  -c=? Ezt a konfigurációs fájlt olvassa be\n"
 "  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "„%s” kiválasztása forráscsomagként „%s” helyett\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 "A(z) „%2$s” csomag el nem érhető „%1$s” verziójának figyelmen kívül hagyása"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Az alábbi csomag nem található: %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s kézi telepítésűre állítva.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s megjelölve automatikusan telepítettként.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -343,20 +344,20 @@ msgstr ""
 "Ez a parancs elavult. Használja helyette az „apt-mark auto” és az „apt-mark "
 "auto” parancsokat."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Belső hiba, a problémamegoldó hibát okozott"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Nem lehet zárolni a letöltési könyvtárat"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nem található forráscsomag ehhez: %s"
@@ -382,80 +383,80 @@ msgstr ""
 "bzr branch %s\n"
 "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, 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:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nem határozható meg a szabad hely mennyisége itt: %s"
 
-#: cmdline/apt-get.cc:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Letöltendő forrásadat-mennyiség: %sB/%sB.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Letöltendő forrásadat-mennyiség: %sB.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Forrás letöltése: %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Nem sikerült néhány archívumot letölteni."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 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:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "„%s” kibontási parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "„%s” elkészítési parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Hiba a gyermekfolyamatnál"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni "
 "kell"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -464,17 +465,17 @@ msgstr ""
 "Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal "
 "kapcsolatban lásd az apt.conf(5) APT::Architectures részét."
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nem lehet %s fordítási függőségeinek információit letölteni"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, 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:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -483,7 +484,7 @@ msgstr ""
 "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem "
 "engedélyezett a(z) „%4$s” csomagokon"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -492,14 +493,14 @@ msgstr ""
 "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem "
 "található"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl "
 "friss"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -508,7 +509,7 @@ msgstr ""
 "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető "
 "verziója nem elégíti ki a verziókövetelményeket"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -517,30 +518,30 @@ msgstr ""
 "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs "
 "jelölt verziója"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s építési függőségei nem elégíthetők ki."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Nem sikerült az építési függőségeket feldolgozni"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Változási napló ehhez: %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Támogatott modulok:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -629,53 +630,75 @@ msgstr ""
 "információkért és opciókért.\n"
 "                       Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+"Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s nem jelölhető meg, mivel nincs telepítve.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s már be van állítva kézi telepítésűre.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s már meg van jelölve automatikusan telepítettként.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s már be van állítva visszafogásra.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s eddig sem volt visszafogva.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Nem található a(z) %s, a várakozás után sem"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s beállítva visszafogásra.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Visszafogás törölve ezen: %s.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "A dpkg futtatása sikertelen. Van root jogosultsága?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -723,7 +746,7 @@ msgstr ""
 "Lásd még az apt-mark(8) és apt.conf(5) kézikönyvlapokat további\n"
 "információkért."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -772,52 +795,52 @@ msgstr ""
 msgid "Disk not found."
 msgstr "A lemez nem található."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "A fájl nem található"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Nem érhető el"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "A módosítási idő beállítása sikertelen"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Érvénytelen URI, helyi URI-k nem kezdődhetnek //-rel"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Bejelentkezés"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Nem lehet a partner nevét megállapítani"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Nem lehet a helyi nevet megállapítani"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "A kiszolgáló visszautasította a kapcsolatot: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Hibás USER, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Hibás PASS, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -825,124 +848,126 @@ msgstr ""
 "Meg lett adva proxy kiszolgáló, de nincs bejelentkezési parancsfájl és az "
 "Acquire::ftp::ProxyLogin üres."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "A bejelentkezési parancsfájl „%s” parancsa sikertelen, a kiszolgáló üzenete: "
 "%s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Hibás TYPE, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Időtúllépés a kapcsolatban"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "A kiszolgáló lezárta a kapcsolatot"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Olvasási hiba"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "A válasz túlcsordította a puffert."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Protokollhiba"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Írási hiba"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Nem lehet létrehozni a foglalatot"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Nem lehet kapcsolódni az adatfoglalathoz, a kapcsolat túllépte az időkorlátot"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Nem lehet kapcsolódni a passzív foglalathoz."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "A getaddrinfo nem talált figyelőfoglalatot"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Nem lehet összekapcsolódni a foglalattal"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Nem lehet figyelni a foglalaton"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Nem lehet megállapítani a foglalat nevét"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Nem lehet PORT parancsot küldeni"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ismeretlen címcsalád: %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Hibás EPRT, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Az adatfoglalathoz kapcsolódás túllépte az időkorlátot"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Nem lehet elfogadni a kapcsolatot"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Probléma a fájl hash értékének meghatározásakor"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: „%s”"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Az adatfoglalat túllépte az időkorlátot"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Az adatátvitel sikertelen, a kiszolgáló üzenete: „%s”"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Lekérdezés"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Nem lehet meghívni "
 
@@ -978,7 +1003,7 @@ msgstr "Nem lehet kapcsolódni ehhez: %s: %s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kapcsolódás: %s"
@@ -1008,37 +1033,37 @@ msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Nem lehet csatlakozni ehhez: %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Belső hiba: Jó aláírás, de nem állapítható meg a kulcs ujjlenyomata."
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Legalább egy aláírás érvénytelen."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nem indítható el a „gpgv” az aláírás ellenőrzéséhez (telepítve van a gpgv?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Ismeretlen gpgv futtatási hiba"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1046,146 +1071,380 @@ msgstr ""
 "Az alábbi aláírások nem ellenőrizhetők, mert a nyilvános kulcs nem érhető "
 "el:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Az üres fájlok biztosan nem érvényes csomagok"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 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:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Hiba a kiszolgálóról olvasáskor"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "A kiválasztás sikertelen"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Időtúllépés a kapcsolatban"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fájl írásakor"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Várakozás a fejlécekre"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Rossz fejlécsor"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "A HTTP-kiszolgáló érvénytelen válaszfejlécet küldött"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "A HTTP-kiszolgáló érvénytelen Content-Length fejlécet küldött"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "A HTTP-kiszolgáló érvénytelen Content-Range fejlécet küldött"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "A HTTP-kiszolgáló tartománytámogatása sérült"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Ismeretlen dátumformátum"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Rossz fejlécadatok"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Sikertelen kapcsolódás"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Belső hiba"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Frissítés kiszámítása... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Belső hiba, az AllUpgrade megsértett valamit"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Kész"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Függőségek javítása..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " sikertelen."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nem lehet javítani a függőségeket"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Kész"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javításához."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Teljesítetlen függőségek. Próbálja a -f használatával."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "de %s van telepítve"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "de csak %s telepíthető"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "de az nem telepíthető"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "de az egy virtuális csomag"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "de az nincs telepítve"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "de az nincs telepítésre megjelölve"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " vagy"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Az alábbi csomagok vissza lesznek tartva:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Az alábbi csomagok frissítve lesznek:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Az alábbi visszafogott csomagokat cserélem:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s miatt) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n"
+"NE tegye ezt, hacsak nem tudja pontosan, mit csinál!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu frissített, %lu újonnan telepített, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu újratelepítendő, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu visszafejlesztendő, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu eltávolítandó és %lu nem frissített.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[I/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[i/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "I"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex fordítási hiba - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Az update parancsnak nincsenek argumentumai"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 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."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Belső hiba, a rendezés nem fejeződött be"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr "A méretek nem egyeznek, írjon az apt@packages.debian.org címre"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Letöltendő adatmennyiség: %sB/%sB.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Letöltendő adatmennyiség: %sB.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "A művelet után %sB lemezterület kerül felhasználásra.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "A művelet után %sB lemezterület szabadul fel.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Nincs elég szabad hely itt: %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Problémák vannak, és a -y kapcsolót használta --force-yes nélkül"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 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."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Igen, tedd amit mondok!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1196,19 +1455,19 @@ msgstr ""
 "A folytatáshoz írja be ezt a mondatot: „%s”\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Megszakítva."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Folytatni akarja?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Néhány fájlt nem sikerült letölteni"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1216,19 +1475,19 @@ msgstr ""
 "Nem lehet letölteni néhány archívumot. Próbálja futtatni az „apt-get update” "
 "parancsot, vagy használja a --fix-missing kapcsolót."
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "A --fix-missing és az adathordozó-csere jelenleg nem támogatott"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Nem lehet javítani a hiányzó csomagokat."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Telepítés megszakítása."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1242,15 +1501,15 @@ msgstr[1] ""
 "A következő csomagok eltűntek a rendszerből, mivel\n"
 "az összes fájlt más csomagok fölülírták:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nem kellene semmit törölni, az AutoRemover nem indítható"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1268,15 +1527,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Az alábbi információk segíthetnek megoldani a problémát:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Belső hiba, az AutoRemover sérült"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1288,7 +1547,7 @@ msgstr[1] ""
 "A következő csomagok automatikusan lettek telepítve, és már nincs rájuk "
 "szükség:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1297,18 +1556,18 @@ msgstr[0] "%lu csomag automatikusan lett telepítve, és már nincs rá szüksé
 msgstr[1] ""
 "%lu csomag automatikusan lett telepítve, és már nincs rájuk szükség.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Ezt az „apt-get autoremove” paranccsal törölheti."
 msgstr[1] "Ezeket az „apt-get autoremove” paranccsal törölheti."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Próbálja futtatni az „apt-get -f install” parancsot az alábbiak javításához:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1316,7 +1575,7 @@ msgstr ""
 "Teljesítetlen függőségek. Próbálja kiadni az „apt-get -f install” parancsot "
 "csomagok nélkül (vagy telepítse a függőségeket is!)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1328,322 +1587,96 @@ msgstr ""
 "használja, akkor néhány igényelt csomag még nem készült el vagy ki\n"
 "lett mozdítva az Incoming-ból."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Törött csomagok"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Javasolt csomagok:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Ajánlott csomagok:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"NE FELEDJE: Ez csak szimuláció!\n"
+"      Az apt-get rendszergazdai jogokat igényel a tényleges végrehajtáshoz.\n"
+"      Ne feledje, hogy a zárolás is ki van kapcsolva,\n"
+"      így ne számítson a jelenlegi helyzet valósságára!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "A hitelesítési figyelmeztetés felülbírálva.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Néhány csomag nem hitelesíthető"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Sikertelen letöltés: %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "de %s van telepítve"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "de csak %s telepíthető"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "de az nem telepíthető"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "de az egy virtuális csomag"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "de az nincs telepítve"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "de az nincs telepítésre megjelölve"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " vagy"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Az alábbi csomagok vissza lesznek tartva:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Az alábbi csomagok frissítve lesznek:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Az alábbi visszafogott csomagokat cserélem:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s miatt) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n"
-"NE tegye ezt, hacsak nem tudja pontosan, mit csinál!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu frissített, %lu újonnan telepített, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu újratelepítendő, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu visszafejlesztendő, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu eltávolítandó és %lu nem frissített.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[I/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[i/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "I"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex fordítási hiba - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Függőségek javítása..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " sikertelen."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Nem lehet javítani a függőségeket"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Kész"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javításához."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Teljesítetlen függőségek. Próbálja a -f használatával."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Az update parancsnak nincsenek argumentumai"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Frissítés kiszámítása... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Belső hiba, az AllUpgrade megsértett valamit"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Kész"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"NE FELEDJE: Ez csak szimuláció!\n"
-"      Az apt-get rendszergazdai jogokat igényel a tényleges végrehajtáshoz.\n"
-"      Ne feledje, hogy a zárolás is ki van kapcsolva,\n"
-"      így ne számítson a jelenlegi helyzet valósságára!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "„%s” átnevezése sikertelen erre: %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Találat "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Letöltés:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Mellőz "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Hiba "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Letöltve %sB %s alatt (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Folyamatban]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1656,19 +1689,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s nem olvasható"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nem sikerült ide váltani: %s"
@@ -1697,11 +1730,11 @@ msgstr "A(z) „%s” tükörfájl nem olvasható"
 msgid "[Mirror: %s]"
 msgstr "[Tükör: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "A kapcsolat idő előtt lezárult"
 
@@ -1741,1348 +1774,451 @@ msgstr "előtti hibák fontosak. Javítsa azokat, és futtassa az [I]nstallt új
 msgid "Merging available information"
 msgstr "Elérhető információk egyesítése"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Használat:apt-extracttemplates fájl1 [fájl2 ...]\n"
-"\n"
-"Az apt-extracttemplates egy eszköz konfigurációs- és mintainformációk "
-"debian-\n"
-"csomagokból való kibontására\n"
-"\n"
-"Kapcsolók:\n"
-"  -h   Ez a súgó szöveg\n"
-"  -t   Beállítja az átmeneti könyvtárat\n"
-"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
-"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nem lehet írni ebbe: %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "A csomagkiterjesztések listája túl hosszú"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Hiba a(z) %s könyvtár feldolgozásakor"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "A forráskiterjesztések listája túl hosszú"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Hiba a tartalomfájl fejlécének írásakor"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Hiba %s tartalmának feldolgozásakor"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Használat: apt-ftparchive [kapcsolók] parancs\n"
-"Parancsok: packages binarypath [felülbírálófájl [útvonalelőtag]]\n"
-"           sources srcpath [felülbírálófájl [útvonalelőtag]]\n"
-"           contents útvonal\n"
-"           release útvonal\n"
-"           generate konfigfájl [csoportok]\n"
-"           clean konfigfájl\n"
-"\n"
-"Az apt-ftparchive indexfájlokat generál a Debian archívumokhoz. A generálás\n"
-"sok stílusát támogatja, a teljesen automatizálttól kezdve a\n"
-"dpkg-scanpackages és a dpkg-scansources funkcionális helyettesítéséig.\n"
-"\n"
-"Az apt-ftparchive Package fájlokat generál a .deb-ek fájából. A Package\n"
-"fájl minden vezérlő mezőt tartalmaz minden egyes csomagról úgy az MD5\n"
-"hasht mint a fájlméretet. Az override (felülbíráló) fájl támogatott a\n"
-"Prioritás és Szekció mezők értékének kényszerítésére.\n"
-"\n"
-"Hasonlóképpen az apt-ftparchive Sources fájlokat generál .dsc-k fájából.\n"
-"A --source-override opció használható forrás-felülbíráló fájlok megadására\n"
-"\n"
-"A „packages” és „sources” parancsokat a fa gyökeréből kell futtatni.\n"
-"A BinaryPath-nak a rekurzív keresés kiindulópontjára kell mutatnia, és\n"
-"a felülbírálófájlnak a felülbíráló jelzőket kell tartalmaznia. Az "
-"útvonalelőtag\n"
-"hozzáadódik a fájlnév mezőkhöz, ha meg van adva. Felhasználására egy példa "
-"a\n"
-"Debian archívumból:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Kapcsolók:\n"
-"  -h    Ez a súgó szöveg\n"
-"  --md5 MD5 generálás vezérlése\n"
-"  -s=?  Forrás-felülbíráló fájl\n"
-"  -q    Szűkszavú mód\n"
-"  -d=?  Opcionális gyorsítótár-adatbázis kiválasztása\n"
-"  --no-delink „delink” hibakereső mód bekapcsolása\n"
-"  --contents  Tartalom fájl generálásának ellenőrzése\n"
-"  -c=?  Ezt a konfigurációs fájlt olvassa be\n"
-"  -o=?  Beállít egy tetszőleges konfigurációs opciót"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Nincs illeszkedő kiválasztás"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Néhány fájl hiányzik a(z) „%s” csomagfájlcsoportból"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "A DB megsérült, a fájl átnevezve %s.old-ra"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "A DB régi, kísérlet a következő frissítésére: %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Az adatbázis-formátum érvénytelen. Ha az apt egy korábbi verziójáról "
-"frissített, akkor távolítsa el, és hozza létre újra az adatbázist."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%s elérése sikertelen"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Az archívumnak nincs vezérlő rekordja"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Nem sikerült egy mutatóhoz jutni"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "F: %s nem érhető el\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "H: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "F: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "H: Hibás a fájl "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Nem sikerült feloldani ezt: %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Fabejárás nem sikerült"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s megnyitása sikertelen"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink nem hajtható végre erre: %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "%s törlése sikertelen"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s linkelése sikertelen ehhez: %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " a DeLink korlátja (%sB) elérve.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Az archívumnak nem volt csomag mezője"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nem rendelkezik felülbíráló bejegyzéssel\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s karbantartója %s, nem %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nem sikerült memóriát lefoglalni"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s megnyitása sikertelen"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "%s felülbírálás deformált a(z) %llu. sorában #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "%s felülbírálás deformált a(z) %llu. sorában #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "%s felülbírálás deformált a(z) %llu. sorában #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "%s felülbírálás deformált a(z) %llu. sorában #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "„%s” tömörítési algoritmus ismeretlen"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Nem sikerült FILE*-ot létrehozni"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Nem sikerült forkolni"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Gyermekfolyamat tömörítése"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Belső hiba, %s létrehozása sikertelen"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "IO az alfolyamathoz/fájlhoz nem sikerült"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Olvasási hiba az MD5 kiszámításakor"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Hiba %s törlésekor"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "„%s” átnevezése sikertelen erre: %s"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Használat: apt-internal-solver\n"
-"\n"
-"Az apt-internal-solver felülettel a jelenlegi belső feloldó külső\n"
-"feloldóként használható az APT családhoz hibakeresési vagy hasonló céllal\n"
-"\n"
-"Kapcsolók:\n"
-"   -h  Ez a súgó szöveg.\n"
-"   -q  Naplózható kimenet - nincs folyamatjelző\n"
-"   -c=? Ezt a konfigurációs fájlt olvassa be\n"
-"   -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Ismeretlen csomagbejegyzés!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Használat: apt-sortpkgs [kapcsolók] fájl1 [fájl2 ...]\n"
-"\n"
-"Az apt-sortpkgs egy egyszerű eszköz csomagfájlok rendezésére. A -s "
-"kapcsolót\n"
-"lehet használni annak jelzésére hogy ez milyen típusú fájl.\n"
-"\n"
-"Kapcsolók:\n"
-"  -h  Ez a súgó szöveg\n"
-"  -s  Forrásfájlrendezést használ\n"
-"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
-"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Nem sikerült adatcsatornákat létrehozni"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Nem sikerült a gzipet futtatni "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Hibás archívum"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Érvénytelen archívum-aláírás"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Hiba az archívumtag-fejléc olvasásakor"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Érvénytelen archívumtag-fejléc: %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Érvénytelen archívumtag-fejléc"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Az archívum túl rövid"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Nem sikerült olvasni az archívumfejléceket"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "A DropNode hívása egy még mindig linkelt node-ra történt"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "A hash elem nem található!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Nem lehet eltérítést lefoglalni"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Belső hiba az AddDiversion hívásban"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Kísérlet eltérítés felülírására: %s -> %s és %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Dupla %s/%s konfigurációs fájl"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "A(z) %s fájl írása sikertelen"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "A(z) %s fájl bezárása sikertelen"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "A(z) %s útvonal túl hosszú"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "A(z) %s többszöri kicsomagolása"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "A(z) %s könyvtár eltérítve"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "A csomag megpróbál írni a(z) %s/%s eltérített célpontba"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Az eltérített útvonal túl hosszú"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s elérése sikertelen"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "„%s” átnevezése sikertelen erre: %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "A(z) %s könyvtár nem egy könyvtárral lesz helyettesítve"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Nem sikerült a node helyét megtalálni a hashtárolóban"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Az útvonal túl hosszú"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Csomagtalálat felülírása %s verziója nélkül"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s nem érhető el"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "A(z) %s fájl írása sikertelen"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "A(z) %s fájl bezárása sikertelen"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Ez nem egy érvényes DEB archívum, hiányzik a(z) „%s” tag"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Belső hiba, %s tag nem található"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Értelmezhetetlen control fájl"
 
-# FIXME
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Nem lehet mmap-olni egy üres fájlt"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Nem lehetett kettőzni a(z) %i fájlleírót"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Nem sikerült %llu bájtot mmap-olni"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Nem lehet bezárni az mmapot"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Nem lehet szinkronizálni az mmapot"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Nem sikerült %lu bájtot mmap-olni"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "A fájl csonkítása meghiúsult"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"A dinamikus MMap helye elfogyott. Növelje az APT::Cache-Start méretét. A "
-"jelenlegi érték: %lu. (lásd: man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Nem lehet növelni az MMap méretét, mert a(z) %lu bájt korlátot már elérte."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Nem lehet növelni az MMap méretét, mert a felhasználó letiltotta az "
-"automatikus emelést."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lin %lió %lip %limp"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lió %lip %limp"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%lip %limp"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%limp"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s kiválasztás nem található"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Ismeretlen típusrövidítés: „%c”"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "%s konfigurációs fájl megnyitása"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, 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:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Szintaktikai hiba %s: %u: rosszul formázott címke"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, 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:861
-#, 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:868
-#, 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:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Érvénytelen archívum-aláírás"
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Szintaktikai hiba %s:%u: „%s” nem támogatott előírás"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Hiba az archívumtag-fejléc olvasásakor"
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Szintaktikai hiba %s:%u: a törlési parancs egy beállítási fát vár "
-"argumentumként"
+msgid "Invalid archive member header %s"
+msgstr "Érvénytelen archívumtag-fejléc: %s"
 
-#: apt-pkg/contrib/configuration.cc:934
-#, 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"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Érvénytelen archívumtag-fejléc"
 
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Hiba!"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Az archívum túl rövid"
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Kész"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Nem sikerült olvasni az archívumfejléceket"
 
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Nem sikerült adatcsatornákat létrehozni"
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Kész"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Nem sikerült a gzipet futtatni "
 
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "A(z) „%c” parancssori kapcsoló [a következőből: %s] ismeretlen."
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Hibás archívum"
 
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "%s parancssori kapcsoló értelmezhetetlen"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült"
 
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "%s parancssori kapcsoló nem logikai"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag"
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "%s kapcsolóhoz argumentum szükséges."
+msgid "Unable to stat %s."
+msgstr "%s nem érhető el."
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "Progress: [%3i%%]"
 msgstr ""
-"%s kapcsoló: a konfigurációs elem megadásához szükséges egy =<érték> rész."
 
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "%s kapcsoló egész, és nem „%s” típusú argumentumot követel meg"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "A dpkg futtatása"
 
-#: apt-pkg/contrib/cmndline.cc:304
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Túl hosszú „%s” kapcsoló"
+msgid "Packaging system '%s' is not supported"
+msgstr "A(z) „%s” csomagrendszer nem támogatott"
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "%s jelentés nem értelmezhető, próbálja a true vagy false értékeket."
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "A megfelelő csomagrendszertípus nem határozható meg"
 
-#: apt-pkg/contrib/cmndline.cc:386
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Invalid operation %s"
-msgstr "%s érvénytelen művelet"
+msgid "Wrote %i records.\n"
+msgstr "%i rekord kiírva.\n"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "%s csatolási pont nem érhető el"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Nem sikerült elérni a CD-ROM-ot."
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i rekord kiírva, %i hiányzó fájllal.\n"
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Hiba a(z) %s gzip fájl bezárásakor"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i rekord kiírva %i eltérő fájllal\n"
 
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Nem lesz zárolva a(z) „%s” csak olvasható zárolási fájl"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "%i rekord kiírva %i hiányzó és %i eltérő fájllal\n"
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open lock file %s"
-msgstr "%s zárolási fájl nem nyitható meg"
+msgid "Can't find authentication record for: %s"
+msgstr "%s hitelesítési rekordja nem található"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Nem lesz zárolva a(z) %s NFS-csatolású zárolási fájl"
+msgid "Hash mismatch for: %s"
+msgstr "%s ellenőrzőösszege nem megfelelő"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not get lock %s"
-msgstr "Nem sikerült zárolni: %s"
+msgid "The method driver %s could not be found."
+msgstr "A(z) %s metódusvezérlő nem található."
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "A fájlok listáját nem lehetett létrehozni, mert „%s” nem könyvtár"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-"„%s” figyelmen kívül hagyása a(z) „%s” könyvtárban, mert nem szabályos fájl"
+msgid "Method %s did not start correctly"
+msgstr "A(z) %s metódus nem indult el megfelelően"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert nincs "
-"fájlkiterjesztése"
+"Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az "
+"Entert."
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert érvénytelen "
-"fájlkiterjesztése van"
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "%s alfolyamat szegmentálási hibát okozott."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "A(z) %s alfolyamat %u számú szignált kapott."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, 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:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "%s alfolyamat váratlanul kilépett"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Nem lehet megnyitni a(z) %s fájlt"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Nem lehet megnyitni a(z) %d fájlleírót"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Nem sikerült az alfolyamat IPC-t létrehozni"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Nem sikerült elindítani a tömörítőt "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "olvasás, még kellene %llu, de már az összes elfogyott"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "írás, még kiírandó %llu, de ez nem lehetséges"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "Hiba a(z) %s fájl bezárásakor"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Hiba a(z) %s fájl átnevezésekor erre: %s"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Hiba a(z) %s fájl törlésekor"
+"A csomaglisták vagy az állapotfájl nem dolgozhatók fel vagy nem nyithatók "
+"meg."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Hiba a fájl szinkronizálásakor"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Próbálja futtatni az „apt-get update” parancsot ezen hibák javításához"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nincs kulcstartó telepítve ide: %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "A források listája olvashatatlan."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Üres csomaggyorsítótár"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "A csomaggyorsítótár fájl megsérült"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "A csomaggyorsítótár-fájl inkompatibilis verziójú"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "A csomaggyorsítótár-fájl sérült, túl kicsi"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "A csomaggyorsítótár egy másik architektúrához készült"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Függ ettől"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Függ ettől (előfüggés)"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Javasolja"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Ajánlja"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Ütközik"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Kicseréli"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Elavulttá teszi"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Töri"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Bővíti"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "fontos"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "szükséges"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "szabványos"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "opcionális"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Függőségi fa építése"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Lehetséges verziók"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Függőséggenerálás"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Állapotinformációk olvasása"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s állapotfájl megnyitása sikertelen"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s átmeneti állapotfájl írása sikertelen"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] "
-"feldolgozhatatlan)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl "
-"rövid)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
-"érvényes hozzárendelés)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
-"tartalmaz kulcsot)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak "
-"nincs értéke)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "%s megnyitása"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Nem lehetett a(z) „%s” közvetlen beállítását végrehajtani. A részletekért "
-"lásd a man 5 apt.conf oldalt az APT::Immediate-Configure címszó alatt. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "A(z) „%s” beállítása sikertelen"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Ez a telepítési lépés átmenetileg megköveteli a(z) %s alapvető csomag "
-"eltávolítását, ami ütközési/előfüggőségi hurkot okoz. Ez gyakran rossz, de "
-"ha tényleg ezt akarja tenni, aktiválja az APT::Force-LoopBreak opciót."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "A(z) „%s” indexfájltípus nem támogatott"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
-"csomagok okozhatják."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "A(z) %spartial listakönyvtár hiányzik."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "A(z) %spartial archívumkönyvtár hiányzik."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "%s könyvtár zárolása sikertelen"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "%li/%li fájl letöltése (%s marad)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "%li/%li fájl letöltése"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "A(z) %s metódusvezérlő nem található."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "A(z) %s metódus nem indult el megfelelően"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az "
-"Entert."
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "A(z) „%s” csomagrendszer nem támogatott"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "A megfelelő csomagrendszertípus nem határozható meg"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s nem érhető el."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Néhány „source” URI-t el kell helyezni a sources.list fájlban"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"A csomaglisták vagy az állapotfájl nem dolgozhatók fel vagy nem nyithatók "
-"meg."
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Próbálja futtatni az „apt-get update” parancsot ezen hibák javításához"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "A források listája olvashatatlan."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"A(z) „%s” érték érvénytelen az APT::Default-Release beállításhoz, mert nincs "
-"ilyen kiadás a forrásokban"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Érvénytelen rekord a(z) %s beállításfájlban, nincs Package fejléc"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "A(z) %s rögzítéstípus nem értelmezhető"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Nincs prioritás (vagy nulla) megadva a rögzítéshez"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Az APT által kezelhető csomagnevek száma túllépve."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Az APT által kezelhető csomagverziók száma túllépve."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Az APT által kezelhető csomagleírások száma túllépve."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Az APT által kezelhető függőségek száma túllépve."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "A(z) %s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása "
 "közben"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Csomaglisták olvasása"
 
 # FIXME
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "„Biztosítja” kapcsolatok összegyűjtése"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nem lehet írni ebbe: %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "IO hiba a forrás-gyorsítótár mentésekor"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "A helyzet elküldése a solvernek"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Kérés küldése a solvernek"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Felkészülés megoldás fogadására"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Külső solver végrehajtása"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "sikertelen átnevezés, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "A Hash Sum nem megfelelő"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "A méret nem megfelelő"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "%s érvénytelen művelet"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3091,16 +2227,16 @@ msgstr ""
 "A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list "
 "bejegyzés vagy helytelenül formázott fájl)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3109,12 +2245,12 @@ msgstr ""
 "A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló "
 "frissítései nem kerülnek alkalmazásra."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3124,12 +2260,12 @@ msgstr ""
 "előző indexfájl lesz használva. GPG hiba: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG hiba: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3138,83 +2274,146 @@ msgstr ""
 "Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
 "kell kijavítani a csomagot. (hiányzó arch. miatt)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "A csomagindexfájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "A(z) %s Release fájl nem dolgozható fel"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
+msgid "List directory %spartial is missing."
+msgstr "A(z) %spartial listakönyvtár hiányzik."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Nincs Hash bejegyzés a(z) %s Release fájlban"
+msgid "Archives directory %spartial is missing."
+msgstr "A(z) %spartial archívumkönyvtár hiányzik."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Érvénytelen „Valid-Until” bejegyzés a(z) %s Release fájlban"
+msgid "Unable to lock directory %s"
+msgstr "%s könyvtár zárolása sikertelen"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li/%li fájl letöltése (%s marad)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot"
+msgid "Retrieving file %li of %li"
+msgstr "%li/%li fájl letöltése"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Néhány indexfájlt nem sikerült letölteni. Figyelmen kívül lettek hagyva, "
+"vagy régebbiek lettek felhasználva."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Néhány „source” URI-t el kell helyezni a sources.list fájlban"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"A(z) „%s” érték érvénytelen az APT::Default-Release beállításhoz, mert nincs "
+"ilyen kiadás a forrásokban"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Érvénytelen rekord a(z) %s beállításfájlban, nincs Package fejléc"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "A(z) %s rögzítéstípus nem értelmezhető"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Nincs prioritás (vagy nulla) megadva a rögzítéshez"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Nem lehetett a(z) „%s” közvetlen beállítását végrehajtani. A részletekért "
+"lásd a man 5 apt.conf oldalt az APT::Immediate-Configure címszó alatt. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "A(z) „%s” beállítása sikertelen"
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Ez a telepítési lépés átmenetileg megköveteli a(z) %s alapvető csomag "
+"eltávolítását, ami ütközési/előfüggőségi hurkot okoz. Ez gyakran rossz, de "
+"ha tényleg ezt akarja tenni, aktiválja az APT::Force-LoopBreak opciót."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM leválasztása...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "%s CD-ROM csatolási pont használata\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "CD-ROM leválasztása\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Várakozás a lemezre...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "CD-ROM csatolása...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Azonosítás... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Tárolt címke: %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM leválasztása...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Indexfájlok keresése a lemezen...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3223,7 +2422,7 @@ msgstr ""
 "%zu csomagindex, %zu forrásindex, %zu fordításindex és %zu aláírás "
 "megtalálva\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3231,16 +2430,16 @@ msgstr ""
 "Nem találhatók csomagfájlok, lehet hogy ez nem Debian lemez, vagy nem "
 "megfelelő az architektúra?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Talált címke: „%s”\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "A név érvénytelen, próbálja újra.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3249,79 +2448,104 @@ msgstr ""
 "A lemez neve: \n"
 "„%s”\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Csomaglisták másolása..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Új forráslista írása\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i rekord kiírva.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i rekord kiírva, %i hiányzó fájllal.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
+"csomagok okozhatják."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Függőségi fa építése"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Lehetséges verziók"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Függőséggenerálás"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Állapotinformációk olvasása"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i rekord kiírva %i eltérő fájllal\n"
+msgid "Failed to open StateFile %s"
+msgstr "%s állapotfájl megnyitása sikertelen"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, 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 eltérő fájllal\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s átmeneti állapotfájl írása sikertelen"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "%s hitelesítési rekordja nem található"
+msgid "Unable to parse package file %s (1)"
+msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "%s ellenőrzőösszege nem megfelelő"
+msgid "Unable to parse package file %s (2)"
+msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "„%s” kiadás nem található ehhez: „%s”"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "„%s” verzió nem található ehhez: „%s”"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "„%s” feladat nem található"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "„%s” csomagból nem választható verzió, mert teljesen virtuális"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3330,173 +2554,246 @@ msgstr ""
 "„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, "
 "mert egyikkel sem rendelkezik"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "„%s” csomag legújabb verziója nem választható ki, mert teljesen virtuális"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "„%s” csomag kiadásra jelölt verziója nem választható ki, mert nincs jelöltje"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "„%s” csomag telepített verziója nem választható ki, mert nincs telepítve"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "A helyzet elküldése a solvernek"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "A(z) %s Release fájl nem dolgozható fel"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Kérés küldése a solvernek"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Felkészülés megoldás fogadására"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Nincs Hash bejegyzés a(z) %s Release fájlban"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Érvénytelen „Valid-Until” bejegyzés a(z) %s Release fájlban"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Külső solver végrehajtása"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
+
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] "
+"feldolgozhatatlan)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "A dpkg futtatása"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl "
+"rövid)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
-"Néhány indexfájlt nem sikerült letölteni. Figyelmen kívül lettek hagyva, "
-"vagy régebbiek lettek felhasználva."
+"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
+"érvényes hozzárendelés)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
+"tartalmaz kulcsot)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak "
+"nincs értéke)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s megnyitása"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "%s telepítése"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "%s konfigurálása"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "%s eltávolítása"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s teljes eltávolítása"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "„%s” eltűnése feljegyezve"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "A(z) %s telepítés utáni trigger futtatása"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "A(z) „%s” könyvtár hiányzik"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "A(z) „%s” fájl megnyitása sikertelen"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "%s előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s kicsomagolása"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfigurálásának előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s telepítve"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, 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:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s eltávolítva"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s teljes eltávolításának előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s teljesen eltávolítva"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Nem lehet írni ebbe: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "A művelet megszakadt, mielőtt befejeződhetett volna"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "függőségi hibák - a csomag beállítatlan maradt"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3504,7 +2801,7 @@ msgstr ""
 "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba "
 "egy korábbi hiba következménye."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3512,7 +2809,7 @@ msgstr ""
 "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a "
 "lemez"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3520,7 +2817,7 @@ msgstr ""
 "Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási "
 "hibát jelez"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3528,13 +2825,13 @@ msgstr ""
 "Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren "
 "lévő hibát jelez"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Nem került kiírásra apport jelentés, mert a hibaüzenet dpkg I/O hibát jelez"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3543,7 +2840,7 @@ msgstr ""
 "Az adminisztrációs könyvtár (%s) nem zárolható, lehet hogy másik folyamat "
 "használja?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3551,7 +2848,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3559,10 +2856,747 @@ msgstr ""
 "A dpkg megszakadt, saját kezűleg kell futtatnia a(z) „%s” parancsot a "
 "probléma megoldásához. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Nincs zárolva"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lin %lió %lip %limp"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lió %lip %limp"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%lip %limp"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%limp"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s kiválasztás nem található"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Nem lesz zárolva a(z) „%s” csak olvasható zárolási fájl"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "%s zárolási fájl nem nyitható meg"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Nem lesz zárolva a(z) %s NFS-csatolású zárolási fájl"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Nem sikerült zárolni: %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "A fájlok listáját nem lehetett létrehozni, mert „%s” nem könyvtár"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+"„%s” figyelmen kívül hagyása a(z) „%s” könyvtárban, mert nem szabályos fájl"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+"„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert nincs "
+"fájlkiterjesztése"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert érvénytelen "
+"fájlkiterjesztése van"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "%s alfolyamat szegmentálási hibát okozott."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "A(z) %s alfolyamat %u számú szignált kapott."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "%s alfolyamat váratlanul kilépett"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Hiba a(z) %s gzip fájl bezárásakor"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Nem lehet megnyitni a(z) %s fájlt"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nem lehet megnyitni a(z) %d fájlleírót"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Nem sikerült az alfolyamat IPC-t létrehozni"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Nem sikerült elindítani a tömörítőt "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "olvasás, még kellene %llu, de már az összes elfogyott"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "írás, még kiírandó %llu, de ez nem lehetséges"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Hiba a(z) %s fájl bezárásakor"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Hiba a(z) %s fájl átnevezésekor erre: %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Hiba a(z) %s fájl törlésekor"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Hiba a fájl szinkronizálásakor"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Hiba!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Kész"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Kész"
+
+# FIXME
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Nem lehet mmap-olni egy üres fájlt"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Nem lehetett kettőzni a(z) %i fájlleírót"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Nem sikerült %llu bájtot mmap-olni"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Nem lehet bezárni az mmapot"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Nem lehet szinkronizálni az mmapot"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nem sikerült %lu bájtot mmap-olni"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "A fájl csonkítása meghiúsult"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"A dinamikus MMap helye elfogyott. Növelje az APT::Cache-Start méretét. A "
+"jelenlegi érték: %lu. (lásd: man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Nem lehet növelni az MMap méretét, mert a(z) %lu bájt korlátot már elérte."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Nem lehet növelni az MMap méretét, mert a felhasználó letiltotta az "
+"automatikus emelést."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "%s csatolási pont nem érhető el"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Nem sikerült elérni a CD-ROM-ot."
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Ismeretlen típusrövidítés: „%c”"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "%s konfigurációs fájl megnyitása"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Szintaktikai hiba %s: %u: rosszul formázott címke"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, 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:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Szintaktikai hiba %s:%u: a törlési parancs egy beállítási fát vár "
+"argumentumként"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, 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"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nincs kulcstartó telepítve ide: %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "A(z) „%c” parancssori kapcsoló [a következőből: %s] ismeretlen."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "%s parancssori kapcsoló értelmezhetetlen"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "%s parancssori kapcsoló nem logikai"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "%s kapcsolóhoz argumentum szükséges."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"%s kapcsoló: a konfigurációs elem megadásához szükséges egy =<érték> rész."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "%s kapcsoló egész, és nem „%s” típusú argumentumot követel meg"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Túl hosszú „%s” kapcsoló"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "%s jelentés nem értelmezhető, próbálja a true vagy false értékeket."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "%s érvénytelen művelet"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Használat:apt-extracttemplates fájl1 [fájl2 ...]\n"
+"\n"
+"Az apt-extracttemplates egy eszköz konfigurációs- és mintainformációk "
+"debian-\n"
+"csomagokból való kibontására\n"
+"\n"
+"Kapcsolók:\n"
+"  -h   Ez a súgó szöveg\n"
+"  -t   Beállítja az átmeneti könyvtárat\n"
+"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
+"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s nem érhető el"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "A csomagkiterjesztések listája túl hosszú"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Hiba a(z) %s könyvtár feldolgozásakor"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "A forráskiterjesztések listája túl hosszú"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Hiba a tartalomfájl fejlécének írásakor"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Hiba %s tartalmának feldolgozásakor"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Használat: apt-ftparchive [kapcsolók] parancs\n"
+"Parancsok: packages binarypath [felülbírálófájl [útvonalelőtag]]\n"
+"           sources srcpath [felülbírálófájl [útvonalelőtag]]\n"
+"           contents útvonal\n"
+"           release útvonal\n"
+"           generate konfigfájl [csoportok]\n"
+"           clean konfigfájl\n"
+"\n"
+"Az apt-ftparchive indexfájlokat generál a Debian archívumokhoz. A generálás\n"
+"sok stílusát támogatja, a teljesen automatizálttól kezdve a\n"
+"dpkg-scanpackages és a dpkg-scansources funkcionális helyettesítéséig.\n"
+"\n"
+"Az apt-ftparchive Package fájlokat generál a .deb-ek fájából. A Package\n"
+"fájl minden vezérlő mezőt tartalmaz minden egyes csomagról úgy az MD5\n"
+"hasht mint a fájlméretet. Az override (felülbíráló) fájl támogatott a\n"
+"Prioritás és Szekció mezők értékének kényszerítésére.\n"
+"\n"
+"Hasonlóképpen az apt-ftparchive Sources fájlokat generál .dsc-k fájából.\n"
+"A --source-override opció használható forrás-felülbíráló fájlok megadására\n"
+"\n"
+"A „packages” és „sources” parancsokat a fa gyökeréből kell futtatni.\n"
+"A BinaryPath-nak a rekurzív keresés kiindulópontjára kell mutatnia, és\n"
+"a felülbírálófájlnak a felülbíráló jelzőket kell tartalmaznia. Az "
+"útvonalelőtag\n"
+"hozzáadódik a fájlnév mezőkhöz, ha meg van adva. Felhasználására egy példa "
+"a\n"
+"Debian archívumból:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Kapcsolók:\n"
+"  -h    Ez a súgó szöveg\n"
+"  --md5 MD5 generálás vezérlése\n"
+"  -s=?  Forrás-felülbíráló fájl\n"
+"  -q    Szűkszavú mód\n"
+"  -d=?  Opcionális gyorsítótár-adatbázis kiválasztása\n"
+"  --no-delink „delink” hibakereső mód bekapcsolása\n"
+"  --contents  Tartalom fájl generálásának ellenőrzése\n"
+"  -c=?  Ezt a konfigurációs fájlt olvassa be\n"
+"  -o=?  Beállít egy tetszőleges konfigurációs opciót"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Nincs illeszkedő kiválasztás"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Néhány fájl hiányzik a(z) „%s” csomagfájlcsoportból"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "A DB megsérült, a fájl átnevezve %s.old-ra"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "A DB régi, kísérlet a következő frissítésére: %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Az adatbázis-formátum érvénytelen. Ha az apt egy korábbi verziójáról "
+"frissített, akkor távolítsa el, és hozza létre újra az adatbázist."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Az archívumnak nincs vezérlő rekordja"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Nem sikerült egy mutatóhoz jutni"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "F: %s nem érhető el\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "H: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "F: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "H: Hibás a fájl "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Nem sikerült feloldani ezt: %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Fabejárás nem sikerült"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s megnyitása sikertelen"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "readlink nem hajtható végre erre: %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "%s törlése sikertelen"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s linkelése sikertelen ehhez: %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " a DeLink korlátja (%sB) elérve.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Az archívumnak nem volt csomag mezője"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s nem rendelkezik felülbíráló bejegyzéssel\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s karbantartója %s, nem %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Nem sikerült memóriát lefoglalni"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s megnyitása sikertelen"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "%s felülbírálás deformált a(z) %llu. sorában #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "%s felülbírálás deformált a(z) %llu. sorában #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "%s felülbírálás deformált a(z) %llu. sorában #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "%s felülbírálás deformált a(z) %llu. sorában #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "„%s” tömörítési algoritmus ismeretlen"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Nem sikerült FILE*-ot létrehozni"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Nem sikerült forkolni"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Gyermekfolyamat tömörítése"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Belső hiba, %s létrehozása sikertelen"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IO az alfolyamathoz/fájlhoz nem sikerült"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Olvasási hiba az MD5 kiszámításakor"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Hiba %s törlésekor"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Használat: apt-internal-solver\n"
+"\n"
+"Az apt-internal-solver felülettel a jelenlegi belső feloldó külső\n"
+"feloldóként használható az APT családhoz hibakeresési vagy hasonló céllal\n"
+"\n"
+"Kapcsolók:\n"
+"   -h  Ez a súgó szöveg.\n"
+"   -q  Naplózható kimenet - nincs folyamatjelző\n"
+"   -c=? Ezt a konfigurációs fájlt olvassa be\n"
+"   -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Ismeretlen csomagbejegyzés!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Használat: apt-sortpkgs [kapcsolók] fájl1 [fájl2 ...]\n"
+"\n"
+"Az apt-sortpkgs egy egyszerű eszköz csomagfájlok rendezésére. A -s "
+"kapcsolót\n"
+"lehet használni annak jelzésére hogy ez milyen típusú fájl.\n"
+"\n"
+"Kapcsolók:\n"
+"  -h  Ez a súgó szöveg\n"
+"  -s  Forrásfájlrendezést használ\n"
+"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
+"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s nem egy érvényes DEB csomag."
 
diff --git a/po/it.po b/po/it.po
index 29c18c158..77183b431 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2013-08-27 22:06+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -20,154 +20,155 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-06-25 19:48+0000\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Totale nomi dei pacchetti: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Totale strutture dei pacchetti: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Pacchetti normali: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Pacchetti virtuali puri: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Pacchetti virtuali singoli: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Pacchetti virtuali misti: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Mancante: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Totale versioni distinte: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Totale descrizioni distinte: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Totale dipendenze: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Totale relazioni ver/file: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Totale relazioni desc/file: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Totale corrispondenze fornite: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Totale stringhe globalizzate: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Totale spazio dipendenza di versione: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Totale spazio inutilizzato: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Totale spazio occupato: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Il file dei pacchetti %s non è sincronizzato."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Nessun pacchetto trovato"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "È necessario specificare almeno un modello per la ricerca"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Questo comando è deprecato. Utilizzare \"apt-mark showauto\" al suo posto."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "File dei pacchetti:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "La cache non è sincronizzata, impossibile referenziare un file di pacchetti"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Pacchetti con gancio:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(non trovato)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Installato: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Gancio del pacchetto: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Tabella versione:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -240,34 +241,35 @@ msgstr ""
 "Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) e \n"
 "apt.conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-"Impossibile rilevare automaticamente un CD-ROM oppure è stato trovato con "
-"il\n"
-"punto di mount predefinito.\n"
-"È possibile provare l'opzione --cdrom per impostare il punto di mount del\n"
-"CD-ROM. Per maggiori informazioni sull'autorilevamento e sul punto di mount\n"
-"del CD-ROM, consultare \"man apt-cdrom\"."
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Dare un nome a questo disco, tipo \"Debian 5.0.3 Disco 1\""
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Inserire un disco nell'unità e premere Invio"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Mount di \"%s\" su \"%s\" non riuscito"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+#, fuzzy
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+"Impossibile rilevare automaticamente un CD-ROM oppure è stato trovato con "
+"il\n"
+"punto di mount predefinito.\n"
+"È possibile provare l'opzione --cdrom per impostare il punto di mount del\n"
+"CD-ROM. Per maggiori informazioni sull'autorilevamento e sul punto di mount\n"
+"del CD-ROM, consultare \"man apt-cdrom\"."
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ripetere questo processo per il resto dei CD."
 
@@ -303,50 +305,50 @@ msgstr ""
 "  -c=? Legge come configurazione il file specificato\n"
 "  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Scelto \"%s\" come pacchetto sorgente al posto di \"%s\"\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Ignorata la versione \"%s\" non disponibile del pacchetto \"%s\""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "È stato impostato %s per l'installazione manuale.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s impostato automaticamente come installato.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -354,20 +356,20 @@ msgstr ""
 "Questo comando è deprecato. Utilizzare \"apt-mark auto\" e \"apt-mark manual"
 "\" al suo posto."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Impossibile bloccare la directory di scaricamento"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossibile trovare un pacchetto sorgente per %s"
@@ -394,80 +396,80 @@ msgstr ""
 "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del "
 "pacchetto.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossibile determinare lo spazio libero in %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Lo spazio libero in %s è insufficiente"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "È necessario recuperare %sB/%sB di sorgenti.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "È necessario scaricare %sB di sorgenti.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Recupero sorgente %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Recupero di alcuni archivi non riuscito."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Scaricamento completato e in modalità solo scaricamento"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando di estrazione \"%s\" non riuscito.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando \"%s\" di generazione non riuscito.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Creazione processo figlio non riuscita"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "È necessario specificare almeno un pacchetto di cui controllare le "
 "dipendenze di generazione"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -476,17 +478,17 @@ msgstr ""
 "Informazioni sull'architettura non disponibili per %s. Consultare apt."
 "conf(5) APT::Architectures per l'impostazione"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ha dipendenze di generazione.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -495,7 +497,7 @@ msgstr ""
 "La dipendenza %s per %s non può essere soddisfatta perché %s non è "
 "consentito su pacchetti \"%s\""
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -504,14 +506,14 @@ msgstr ""
 "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
 "non può essere trovato"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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 recente"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -520,7 +522,7 @@ msgstr ""
 "La dipendenza %s per %s non può essere soddisfatta perché la versione "
 "candidata del pacchetto %s non può soddisfare i requisiti di versione"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -529,30 +531,30 @@ msgstr ""
 "La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s "
 "non ha una versione candidata"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Elaborazione delle dipendenze di generazione non riuscita"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog per %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Moduli supportati:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -642,53 +644,75 @@ msgstr ""
 "apt-get(8), sources.list(5) e apt.conf(5).\n"
 "                       Questo APT ha i poteri della Super Mucca.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+"È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s non può essere segnato perché non è installato.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s è già stato impostato come installato manualmente.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s è già stato impostato come installato automaticamente.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s è già stato impostato come bloccato.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s era già non bloccato.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "In attesa di %s ma non era presente"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s impostato come bloccato.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Blocco su %s annullato.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Esecuzione di dpkg non riuscita. È stato lanciato come root?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -737,7 +761,7 @@ msgstr ""
 "Per maggiori informazioni, consultare le pagine di manuale apt-mark(8) e\n"
 "apt.conf(5)."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -785,52 +809,52 @@ msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso."
 msgid "Disk not found."
 msgstr "Disco non trovato"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "File non trovato"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Esecuzione di stat non riuscita"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Impostazione della data di modifica non riuscita"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI non valido, gli URI locali non devono iniziare con //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Accesso in corso"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Impossibile determinare il nome del nodo"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Impossibile determinare il nome locale"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Il server ha rifiutato la connessione e riporta: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -838,123 +862,125 @@ msgstr ""
 "È stato specificato un server proxy, ma nessuno script di accesso: Acquire::"
 "ftp::ProxyLogin è vuoto."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Connessione scaduta"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Il server ha chiuso la connessione"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Errore di lettura"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Una risposta ha superato le dimensioni del buffer."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Protocollo danneggiato"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Errore di scrittura"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Impossibile creare un socket"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Impossibile connettersi al socket dati, tempo esaurito per la connessione"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Impossibile connettersi alla socket passiva."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Impossibile eseguire bind() su un socket"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Impossibile eseguire listen() su un socket"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Impossibile determinare il nome del socket"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Impossibile inviare il comando PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Connessione al socket dati terminata"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Impossibile accettare connessioni"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Si è verificato un problema nel creare l'hash del file"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossibile recuperare il file, il server riporta: \"%s\""
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Socket dati terminato"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\""
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Interrogazione"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Impossibile invocare "
 
@@ -990,7 +1016,7 @@ msgstr "Impossibile connettersi a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connessione a %s"
@@ -1021,25 +1047,25 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossibile connettersi a %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Errore interno: firma corretta, ma non è possibile determinare l'impronta "
 "della chiave."
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "È stata trovata almeno una firma non valida."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Impossibile eseguire \"gpgv\" per verificare la firma (forse gpgv non è "
 "installato)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1048,15 +1074,15 @@ msgstr ""
 "Il file con la firma in chiaro non è valido, ottenuto \"%s\" (la rete "
 "richiede autenticazione?)"
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Le seguenti firme non erano valide:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1064,140 +1090,375 @@ msgstr ""
 "Le seguenti firme non sono state verificate perché la chiave pubblica non è "
 "disponibile:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "File vuoti non possono essere archivi validi"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Errore nello scrivere sul file"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Errore nel leggere dal server"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Errore nello scrivere su file"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Select non riuscita"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Connessione terminata"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Errore nello scrivere sul file di output"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "In attesa degli header"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Riga header non corretta"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Il server HTTP ha inviato un header di risposta non valido"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Il server HTTP ha inviato un header Content-Length non valido"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Il server HTTP ha inviato un header Content-Range non valido"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Questo server HTTP ha un supporto del range non corretto"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Formato della data sconosciuto"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Header dati non corretto"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Connessione non riuscita"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calcolo dell'aggiornamento... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Eseguito"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Correzione delle dipendenze..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " non riuscita."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Impossibile correggere le dipendenze"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossibile minimizzare l'insieme da aggiornare"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fatto"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dipendenze non trovate. Riprovare usando -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installato]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installato]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installato]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installato]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "ma la versione %s è installata"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ma la versione %s sta per essere installata"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "ma non è installabile"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "ma è un pacchetto virtuale"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "ma non è installato"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "ma non sta per essere installato"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " oppure"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "I seguenti pacchetti NUOVI saranno installati:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "I seguenti pacchetti saranno RIMOSSI:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "I seguenti pacchetti saranno aggiornati:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "I seguenti pacchetti saranno RETROCESSI:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "I seguenti pacchetti bloccati saranno cambiati:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (a causa di %s) "
+
+#: apt-private/private-output.cc:662
+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: 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."
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aggiornati, %lu installati, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstallati, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu retrocessi, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu da rimuovere e %lu non aggiornati.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu non completamente installati o rimossi.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Errore di compilazione dell'espressione regolare - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Il comando update non accetta argomenti"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Errore interno, InstallPackages è stato chiamato con un pacchetto "
 "danneggiato."
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Errore interno, l'ordinamento non è stato terminato"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Le dimensioni non corrispondono. Inviare un'email a: apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "È necessario scaricare %sB/%sB di archivi.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "È necessario scaricare %sB di archivi.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Spazio libero in %s insufficiente."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "È stata specificata la modalità \"Trivial Only\", ma questa non è "
@@ -1205,11 +1466,11 @@ msgstr ""
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Sì, esegui come da richiesta."
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1220,19 +1481,19 @@ msgstr ""
 "Per continuare scrivere la frase \"%s\"\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Interrotto."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Continuare?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Scaricamento di alcuni file non riuscito"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1240,19 +1501,19 @@ msgstr ""
 "Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-"
 "get update\" o provare l'opzione \"--fix-missing\"."
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing su supporti estraibili non è ancora supportato"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Impossibile correggere i pacchetti mancanti."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Interruzione dell'installazione."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1266,16 +1527,16 @@ msgstr[1] ""
 "I seguenti pacchetti sono spariti dal sistema poiché\n"
 "tutti i file sono stati sovrascritti da altri pacchetti:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: questo viene svolto automaticamente e volutamente da dpkg."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1293,15 +1554,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1314,7 +1575,7 @@ msgstr[1] ""
 "I seguenti pacchetti sono stati installati automaticamente e non sono più "
 "richiesti:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1325,18 +1586,18 @@ msgstr[1] ""
 "%lu pacchetti sono stati installati automaticamente e non sono più "
 "richiesti.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Usare \"apt-get autoremove\" per rimuoverlo."
 msgstr[1] "Usare \"apt-get autoremove\" per rimuoverli."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "È utile eseguire \"apt-get -f install\" per correggere questi problemi:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1344,7 +1605,7 @@ msgstr ""
 "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
 "(o specificare una soluzione)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1356,324 +1617,97 @@ msgstr ""
 "usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n"
 "non sono ancora stati creati o sono stati rimossi da Incoming."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Pacchetti danneggiati"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "I seguenti pacchetti saranno inoltre installati:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Pacchetti suggeriti:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Pacchetti raccomandati:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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: questa è solo una simulazione.\n"
+"      apt-get necessita dei privilegi di root per la normale esecuzione.\n"
+"      Inoltre, il meccanismo di blocco non è attivato e non è quindi\n"
+"      utile dare importanza a tutto ciò per una situazione reale."
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Avviso di autenticazione disabilitato.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Alcuni pacchetti non possono essere autenticati"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Installare questi pacchetti senza verificarli?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossibile recuperare %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installato]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installato]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installato]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installato]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "ma la versione %s è installata"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ma la versione %s sta per essere installata"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "ma non è installabile"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "ma è un pacchetto virtuale"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "ma non è installato"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "ma non sta per essere installato"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " oppure"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "I seguenti pacchetti NUOVI saranno installati:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "I seguenti pacchetti saranno RIMOSSI:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "I seguenti pacchetti saranno aggiornati:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "I seguenti pacchetti saranno RETROCESSI:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "I seguenti pacchetti bloccati saranno cambiati:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (a causa di %s) "
-
-#: apt-private/private-output.cc:631
-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: 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."
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aggiornati, %lu installati, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstallati, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu retrocessi, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu da rimuovere e %lu non aggiornati.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu non completamente installati o rimossi.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Errore di compilazione dell'espressione regolare - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Correzione delle dipendenze..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " non riuscita."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Impossibile correggere le dipendenze"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossibile minimizzare l'insieme da aggiornare"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Fatto"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dipendenze non trovate. Riprovare usando -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Il comando update non accetta argomenti"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Calcolo dell'aggiornamento... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Eseguito"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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: questa è solo una simulazione.\n"
-"      apt-get necessita dei privilegi di root per la normale esecuzione.\n"
-"      Inoltre, il meccanismo di blocco non è attivato e non è quindi\n"
-"      utile dare importanza a tutto ciò per una situazione reale."
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Rinomina di %s in %s non riuscita"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Trovato "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Scaricamento di:"
 
 # (ndt) questa non so cosa voglia dire
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Recuperati %sB in %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [In lavorazione]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1686,19 +1720,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossibile leggere %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Impossibile passare a %s"
@@ -1727,11 +1761,11 @@ msgstr "Nessuna voce trovata nel file mirror \"%s\""
 msgid "[Mirror: %s]"
 msgstr "[Mirror: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Connessione chiusa prematuramente"
 
@@ -1776,1363 +1810,454 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Unione delle informazioni disponibili"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Uso: apt-extracttemplates FILE1 [FILE2 ...]\n"
-"\n"
-"apt-extracttemplates è uno strumento per estrarre configurazioni e template\n"
-"dai pacchetti debian\n"
-"\n"
-"Opzioni:\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"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Impossibile scrivere in %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Impossibile trovare la versione di debconf. È installato?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "L'elenco dell'estensione del pacchetto è troppo lungo"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Errore nell'elaborare la directory %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "L'elenco dell'estensione del sorgente è troppo lungo"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Errore nell'elaborare i contenuti %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 [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 ad alternative\n"
-"funzionali per dpkg-scanpackages e dpkg-scansources\n"
-"\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"
-"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. Il percorso al binario deve puntare alla base della ricerca \n"
-"ricorsiva e il file override deve contenere le opzioni di override.\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          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:803
-msgid "No selections matched"
-msgstr "Nessuna selezione corrisponde"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Mancano alcuni file nel file group di pacchetti \"%s\""
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Il database era danneggiato, il file è stato rinominato in %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Il database è vecchio, tentativo di aggiornamento %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Il formato del database non è valido. Se è stato eseguito l'aggiornamento da "
-"una vecchia versione di apt, rimuovere e ricreare il database."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Impossibile aprire il file del database %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Impossibile eseguire stat su %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "L'archivio non ha un campo \"control\""
-
-#: ftparchive/cachedb.cc:490
-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:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Impossibile leggere la directory %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: Impossibile eseguire stat su %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "A: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Gli errori si applicano al file "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Risoluzione di %s non riuscita"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Visita dell'albero non riuscita"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Apertura di %s non riuscita"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Delink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Esecuzione di readlink su %s non riuscita"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Esecuzione di unlink su %s non riuscita"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Collegamento di %s a %s non riuscito"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Raggiunto il limite di DeLink di %sB.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "L'archivio non ha un campo \"package\""
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s non ha un campo override\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  il responsabile di %s è %s non %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s non ha un campo source override\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s non ha neppure un campo binario override\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Allocazione della memoria non riuscita"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Impossibile aprire %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Override %s riga %llu malformato #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Lettura del file override %s non riuscita"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Override %s riga %llu malformato #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Override %s riga %llu malformato #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Override %s riga %llu malformato #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo di compressione \"%s\" sconosciuto"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "L'output compresso %s necessita di un insieme di compressione"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Creazione di FILE* non riuscita"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Fork non riuscita"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Sottoprocesso compresso"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Errore interno, creazione di %s non riuscita"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "I/O al sottoprocesso/file non riuscito"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Lettura durante l'elaborazione MD5 non riuscita"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema nell'unlink di %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Rinomina di %s in %s non riuscita"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-internal-solver\n"
-"\n"
-"apt-internal-solver è un'interfaccia per l'utilizzo del resolver interno\n"
-"come resolver esterno per il debugging degli strumenti APT\n"
-"\n"
-"Opzioni:\n"
-"  -h   Mostra questo aiuto\n"
-"  -q   Output registrabile, nessun indicatore di avanzamento\n"
-"  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Record del pacchetto sconosciuto."
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Uso: apt-sortpkgs [OPZIONI] FILE1 [FILE2 ...]\n"
-"\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   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"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Creazione delle pipe non riuscita"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Esecuzione di gzip non riuscita "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Archivio danneggiato"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Checksum di tar non riuscito, archivio danneggiato"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Firma dell'archivio non valida"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Errore nel leggere l'intestazione member dell'archivio"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Intestazione member dell'archivio %s non valida"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Intestazione member dell'archivio non valida"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "L'archivio è troppo piccolo"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Lettura delle intestazioni dell'archivio non riuscita"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode invocata su un nodo ancora collegato"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Localizzazione dell'elemento hash non riuscita."
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Allocazione della deviazione non riuscita"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Errore interno in AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Tentativo di sovrascrivere una deviazione, %s -> %s e %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Doppia aggiunta di deviazione %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "File di configurazione duplicato %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Scrittura del file %s non riuscita"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Chiusura del file %s non riuscita"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Il percorso %s è troppo lungo"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Estrazione di %s eseguita più di una volta"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "La directory %s è deviata"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 "Il pacchetto sta cercando di scrivere nell'obiettivo di deviazione %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Il percorso della deviazione è troppo lungo"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Impossibile eseguire stat su %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Rinomina di %s in %s non riuscita"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "La directory %s sta per essere sostituita da una non-directory"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Localizzazione del nodo nel suo hash bucket non riuscita"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Il percorso è troppo lungo"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Impossibile eseguire stat su %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Scrittura del file %s non riuscita"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Chiusura del file %s non riuscita"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Errore interno, impossibile trovare il membro %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "File \"control\" non analizzabile"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Impossibile eseguire mmap su un file vuoto"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Impossibile duplicare il descrittore del file %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Impossibile creare mmap di %llu byte"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Impossibile chiudere mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Impossibile sincronizzare mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Impossibile eseguire mmap di %lu byte"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Troncamento del file non riuscito"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Start. Il "
-"valore attuale è: %lu (man 5 apt.conf)."
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Impossibile incrementare la dimensione della MMap poiché il limite di %lu "
-"byte è stato raggiunto."
-
-# (ndt) lunghetta...
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Impossibile incrementare la dimensione della MMap poiché il "
-"ridimensionamento automatico è stato disabilitato dall'utente."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lig %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Firma dell'archivio non valida"
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Errore nel leggere l'intestazione member dell'archivio"
 
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Selection %s not found"
-msgstr "Selezione %s non trovata"
+msgid "Invalid archive member header %s"
+msgstr "Intestazione member dell'archivio %s non valida"
 
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Tipo di abbreviazione non riconosciuto: \"%c\""
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Intestazione member dell'archivio non valida"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Apertura file di configurazione %s"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "L'archivio è troppo piccolo"
 
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Errore di sintassi %s:%u: il blocco inizia senza nome"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Lettura delle intestazioni dell'archivio non riuscita"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Errore di sintassi %s:%u: tag non corretto"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Creazione delle pipe non riuscita"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Errore di sintassi %s:%u: caratteri extra dopo il valore"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Esecuzione di gzip non riuscita "
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Archivio danneggiato"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Errore di sintassi %s:%u: troppe inclusioni annidate"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Checksum di tar non riuscito, archivio danneggiato"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Errore di sintassi %s:%u: incluso da qui"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata"
+msgid "Unable to stat %s."
+msgstr "Impossibile eseguire stat su %s."
 
-# (ndt) sarebbe da controllare meglio...
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Errore di sintassi %s:%u: la direttiva clear richiede un albero di opzioni "
-"come argomento"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, 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"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Errore"
-
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Fatto"
 
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr "..."
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Esecuzione di dpkg"
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... %u%%"
+msgid "Packaging system '%s' is not supported"
+msgstr "Il sistema di pacchetti \"%s\" non è supportato"
 
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Opzione a riga di comando \"%c\" [da %s] sconosciuta."
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
 
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Command line option %s is not understood"
-msgstr "Opzione a riga di comando %s non comprensibile"
+msgid "Wrote %i records.\n"
+msgstr "Scritti %i record.\n"
 
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Opzione a riga di comando %s non booleana"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Scritti %i record con %i file mancanti.\n"
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "L'opzione %s richiede un argomento."
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Scritti %i record con %i file senza corrispondenze\n"
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"Opzione %s: la specifica di configurazione dell'oggetto deve avere un "
-"=<valore>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "L'opzione %s richiede un argomento intero, non \"%s\""
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Opzione \"%s\" troppo lunga"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Il valore %s non è comprensibile, provare \"true\" o \"false\"."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Operazione %s non valida"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Impossibile eseguire stat sul punto di mount %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Esecuzione di stat sul CD-ROM non riuscita"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Si è verificato un problema nel chiudere il file gzip %s"
+"Scritti %i record con %i file mancanti e %i file senza corrispondenze\n"
 
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Blocco disabilitato per il file di blocco in sola lettura %s"
+msgid "Can't find authentication record for: %s"
+msgstr "Impossibile trovare il record di autenticazione per %s"
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open lock file %s"
-msgstr "Impossibile aprire il file di blocco %s"
+msgid "Hash mismatch for: %s"
+msgstr "Hash non corrispondente per %s"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Blocco disabilitato per il file di blocco %s montato via nfs"
+msgid "The method driver %s could not be found."
+msgstr "Impossibile trovare un driver per il metodo %s."
 
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Impossibile impostare il blocco %s"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-"L'elenco dei file non può essere creato poiché \"%s\" non è una directory"
+msgid "Method %s did not start correctly"
+msgstr "Il metodo %s non si è avviato correttamente"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-"Viene ignorato \"%s\" nella directory \"%s\" poiché non è un file regolare"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
 
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"Viene ignorato il file \"%s\" nella directory \"%s\" poiché non ha "
-"un'estensione"
+"L'elenco dei pacchetti o il file di stato non può essere letto o aperto."
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
-"Viene ignorato il file \"%s\" nella directory \"%s\" poiché ha un'estensione "
-"non valida"
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Il sottoprocesso %s ha ricevuto il segnale %u."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Il sottoprocesso %s è uscito inaspettatamente"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Impossibile aprire il file %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Impossibile aprire il descrittore del file %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Creazione di un sottoprocesso IPC non riuscita"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Esecuzione non riuscita del compressore "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "scrittura, ancora %llu da scrivere, ma non è possibile"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "Si è verificato un problema nel chiudere il file %s"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Si è verificato un problema nel rinominare il file %s in %s"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s"
-
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Si è verificato un problema nel sincronizzare il file"
+"È consigliato eseguire \"apt-get update\" per correggere questi problemi"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nessun portachiavi installato in %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Impossibile leggere l'elenco dei sorgenti."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Cache dei pacchetti vuota"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Il file della cache dei pacchetti è danneggiato"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "La versione del file della cache dei pacchetti è incompatibile"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Il file cache del pacchetto è danneggiato, è troppo piccolo"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Questo APT non supporta il sistema di versione \"%s\""
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr ""
 "Il file della cache dei pacchetti è stato generato per un'altra architettura"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Dipende"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Pre-dipende"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Consiglia"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Raccomanda"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Va in conflitto"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Sostituisce"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Rende obsoleto"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Migliora"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "richiesto"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "opzionale"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Generazione albero delle dipendenze"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Versioni candidate"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Generazione delle dipendenze"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Lettura informazioni sullo stato"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Apertura del file di stato %s non riuscita"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Scrittura del file temporaneo di stato %s non riuscita"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Impossibile analizzare il file di pacchetto %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Impossibile analizzare il file di pacchetto %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "La riga %lu nel file %s non è corretta (URI parse)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non "
-"analizzabile)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo "
-"corta)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è "
-"un'assegnazione)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una "
-"chiave)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non "
-"ha un valore)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "La riga %lu nel file %s non è corretta (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "La riga %lu nel file %s non è corretta (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "La riga %lu nel file %s non è corretta (URI parse)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "La riga %lu nel file %s non è corretta (dist parse)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Apertura di %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Riga %u troppo lunga nel file %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "La riga %u nel file %s non è corretta (type)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Impossibile eseguire immediatamente la configurazione su \"%s\". Per "
-"maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::"
-"Immediate-Configure\" (%d)."
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Impossibile configurare \"%s\". "
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"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:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Il file indice di tipo \"%s\" non è supportato"
 
-#: apt-pkg/algorithms.cc:266
-#, 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 è possibile trovarne un "
-"archivio."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo "
-"potrebbe essere causato da pacchetti bloccati."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
-
-# (ndt) sarebbe da controllare meglio assieme a quella dopo
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Manca la directory di liste %spartial."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Manca la directory di archivio %spartial."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Impossibile bloccare la directory %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Scaricamento file %li di %li (%s rimanente)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Scaricamento file %li di %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Impossibile trovare un driver per il metodo %s."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Il metodo %s non si è avviato correttamente"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Il sistema di pacchetti \"%s\" non è supportato"
-
-#: apt-pkg/init.cc:159
-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 eseguire stat su %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"È necessario inserire alcuni URI di tipo \"source\" nel file sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"L'elenco dei pacchetti o il file di stato non può essere letto o aperto."
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"È consigliato eseguire \"apt-get update\" per correggere questi problemi"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Impossibile leggere l'elenco dei sorgenti."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"Il valore \"%s\" non è valido per APT::Default-Release poiché tale release "
-"non è disponibile dalle sorgenti"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-"Campo non valido nel file delle preferenze %s, manca l'intestazione \"Package"
-"\""
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Impossibile comprendere il tipo di gancio %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Priorità per il gancio non specificata (o zero)"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Si è verificato un errore nell'elaborare %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "È stato superato il numero di nomi di pacchetti che questo APT può gestire."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "È stato superato il numero di versioni che questo APT può gestire."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "È stato superato il numero di descrizioni che questo APT può gestire."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "È stato superato il numero di dipendenze che questo APT può gestire."
 
 # (ndt) il primo è il nome del pacchetto, il secondo la versione
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle "
 "dipendenze"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Lettura elenco dei pacchetti"
 
 # (ndt) non mi convince per niente, ma vediamo cosa salta fuori
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Il file fornisce"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Impossibile scrivere in %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Errore di I/O nel salvare la cache sorgente"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Invia lo scenario al solver"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Invia la richiesta al solver"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Preparazione alla ricezione della soluzione"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "Il solver esterno è terminato senza un errore di messaggio"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Esecuzione solver esterno"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "rename() non riuscita: %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Somma hash non corrispondente"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Le dimensioni non corrispondono"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operazione %s non valida"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3141,17 +2266,17 @@ msgstr ""
 "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
 "errata o file danneggiato)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3160,12 +2285,12 @@ msgstr ""
 "Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per "
 "questo repository non verranno applicati."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3175,12 +2300,12 @@ msgstr ""
 "aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Errore GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3189,14 +2314,14 @@ msgstr ""
 "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:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\""
 
 # (ndt) sarebbe da controllare se veramente possono esistere più file indice
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3204,71 +2329,140 @@ msgstr ""
 "I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
 "per il pacchetto %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossibile analizzare il file Release %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Il blocco vendor %s non contiene impronte"
 
-#: apt-pkg/indexrecords.cc:81
+# (ndt) sarebbe da controllare meglio assieme a quella dopo
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Nessuna sezione nel file Release %s"
+msgid "List directory %spartial is missing."
+msgstr "Manca la directory di liste %spartial."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Nessuna voce Hash nel file Release %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Manca la directory di archivio %spartial."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Voce \"Valid-Until\" nel file Release %s non valida"
+msgid "Unable to lock directory %s"
+msgstr "Impossibile bloccare la directory %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Voce \"Date\" nel file Release %s non valida"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Scaricamento file %li di %li (%s rimanente)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Il blocco vendor %s non contiene impronte"
+msgid "Retrieving file %li of %li"
+msgstr "Scaricamento file %li di %li"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Impossibile scaricare alcuni file di indice: saranno ignorati o verranno "
+"usati quelli vecchi."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"È necessario inserire alcuni URI di tipo \"source\" nel file sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"Il valore \"%s\" non è valido per APT::Default-Release poiché tale release "
+"non è disponibile dalle sorgenti"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
+"Campo non valido nel file delle preferenze %s, manca l'intestazione \"Package"
+"\""
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Impossibile comprendere il tipo di gancio %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Priorità per il gancio non specificata (o zero)"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Impossibile eseguire immediatamente la configurazione su \"%s\". Per "
+"maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::"
+"Immediate-Configure\" (%d)."
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Impossibile configurare \"%s\". "
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"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/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Riga %u troppo lunga nel file %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Smontaggio CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Viene usato il punto di mount del CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Smontaggio CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "In attesa del disco...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Montaggio CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Identificazione... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etichette archiviate: %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Smontaggio CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Analisi del disco per file indice...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3277,7 +2471,7 @@ msgstr ""
 "Trovati %zu indici di pacchetto, %zu indici di sorgente, %zu indici di "
 "traduzione e %zu firme\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3285,16 +2479,16 @@ msgstr ""
 "Impossibile trovare alcun file di pacchetto. Questo potrebbe non essere un "
 "disco Debian o potrebbe essere l'architettura errata."
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Trovata l'etichetta \"%s\"\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Questo non è un nome valido, riprovare.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3303,85 +2497,111 @@ msgstr ""
 "Questo disco è chiamato: \n"
 "\"%s\"\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Copia elenco pacchetti..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Scrittura nuovo elenco sorgenti\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Scritti %i record.\n"
+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 è possibile trovarne un "
+"archivio."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Scritti %i record con %i file mancanti.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo "
+"potrebbe essere causato da pacchetti bloccati."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Generazione albero delle dipendenze"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versioni candidate"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generazione delle dipendenze"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lettura informazioni sullo stato"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Scritti %i record con %i file senza corrispondenze\n"
+msgid "Failed to open StateFile %s"
+msgstr "Apertura del file di stato %s non riuscita"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, 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 corrispondenze\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Scrittura del file temporaneo di stato %s non riuscita"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Impossibile trovare il record di autenticazione per %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Impossibile analizzare il file di pacchetto %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash non corrispondente per %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Impossibile analizzare il file di pacchetto %s (2)"
 
 # (ndt) dovrebbe essere inteso il file Release
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release \"%s\" per \"%s\" non trovato."
 
 # (ndt) dovrebbe essere inteso il Version
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version \"%s\" per \"%s\" non trovato"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Impossibile trovare il task \"%s\""
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr ""
 "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Impossibile selezionare le versioni dal pacchetto \"%s\" poiché è virtuale"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3390,178 +2610,251 @@ msgstr ""
 "Impossibile selezionare la versione installata o la candidata dal pacchetto "
 "\"%s\" poiché non sono presenti"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Impossibile selezionare la versione più recente dal pacchetto \"%s\" poiché "
 "è virtuale"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Impossibile selezionare la versione candidata dal pacchetto %s poiché non ha "
 "alcun candidato"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Impossibile selezionare la versione installata dal pacchetto %s poiché non è "
 "installato"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Invia lo scenario al solver"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Impossibile analizzare il file Release %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Invia la richiesta al solver"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Nessuna sezione nel file Release %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Preparazione alla ricezione della soluzione"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Nessuna voce Hash nel file Release %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "Il solver esterno è terminato senza un errore di messaggio"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Voce \"Valid-Until\" nel file Release %s non valida"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Esecuzione solver esterno"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Voce \"Date\" nel file Release %s non valida"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "La riga %lu nel file %s non è corretta (URI parse)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non "
+"analizzabile)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Esecuzione di dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo "
+"corta)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
-"Impossibile scaricare alcuni file di indice: saranno ignorati o verranno "
-"usati quelli vecchi."
+"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è "
+"un'assegnazione)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una "
+"chiave)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non "
+"ha un valore)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "La riga %lu nel file %s non è corretta (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "La riga %lu nel file %s non è corretta (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "La riga %lu nel file %s non è corretta (URI parse)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "La riga %lu nel file %s non è corretta (dist parse)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Apertura di %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "La riga %u nel file %s non è corretta (type)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Installazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Rimozione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Rimozione completa di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Notata la sparizione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Esecuzione comando di post installazione %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory \"%s\" mancante"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Impossibile aprire il file \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Estrazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparazione alla configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Pacchetto %s installato"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparazione alla rimozione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Pacchetto %s rimosso"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparazione alla rimozione completa di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Pacchetto %s rimosso completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Impossibile scrivere in %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "L'operazione è stata interrotta prima di essere completata"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Segnalazione apport non scritta poiché è stato raggiunto il valore massimo "
 "di MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3569,7 +2862,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica la "
 "presenza di un fallimento precedente."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3577,7 +2870,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore per disco pieno."
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3585,7 +2878,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore di memoria esaurita"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3594,14 +2887,14 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore per disco pieno."
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore di I/O di dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3610,7 +2903,7 @@ msgstr ""
 "Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un "
 "altro processo potrebbe tenerla occupata."
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3619,7 +2912,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3627,10 +2920,752 @@ msgstr ""
 "dpkg è stato interrotto. È necessario eseguire \"%s\" per correggere il "
 "problema. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Non bloccato"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lig %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selezione %s non trovata"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Blocco disabilitato per il file di blocco in sola lettura %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Impossibile aprire il file di blocco %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Blocco disabilitato per il file di blocco %s montato via nfs"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Impossibile impostare il blocco %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+"L'elenco dei file non può essere creato poiché \"%s\" non è una directory"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+"Viene ignorato \"%s\" nella directory \"%s\" poiché non è un file regolare"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+"Viene ignorato il file \"%s\" nella directory \"%s\" poiché non ha "
+"un'estensione"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"Viene ignorato il file \"%s\" nella directory \"%s\" poiché ha un'estensione "
+"non valida"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Il sottoprocesso %s ha ricevuto il segnale %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Il sottoprocesso %s è uscito inaspettatamente"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Si è verificato un problema nel chiudere il file gzip %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Impossibile aprire il file %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Impossibile aprire il descrittore del file %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Creazione di un sottoprocesso IPC non riuscita"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Esecuzione non riuscita del compressore "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "scrittura, ancora %llu da scrivere, ma non è possibile"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Si è verificato un problema nel chiudere il file %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Si è verificato un problema nel rinominare il file %s in %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Si è verificato un problema nel sincronizzare il file"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Errore"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Fatto"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr "..."
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Impossibile eseguire mmap su un file vuoto"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Impossibile duplicare il descrittore del file %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Impossibile creare mmap di %llu byte"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Impossibile chiudere mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Impossibile sincronizzare mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Impossibile eseguire mmap di %lu byte"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Troncamento del file non riuscito"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Start. Il "
+"valore attuale è: %lu (man 5 apt.conf)."
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Impossibile incrementare la dimensione della MMap poiché il limite di %lu "
+"byte è stato raggiunto."
+
+# (ndt) lunghetta...
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Impossibile incrementare la dimensione della MMap poiché il "
+"ridimensionamento automatico è stato disabilitato dall'utente."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Impossibile eseguire stat sul punto di mount %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Esecuzione di stat sul CD-ROM non riuscita"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Tipo di abbreviazione non riconosciuto: \"%c\""
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Apertura file di configurazione %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Errore di sintassi %s:%u: il blocco inizia senza nome"
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Errore di sintassi %s:%u: tag non corretto"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Errore di sintassi %s:%u: caratteri extra dopo il valore"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, 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"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Errore di sintassi %s:%u: troppe inclusioni annidate"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Errore di sintassi %s:%u: incluso da qui"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata"
+
+# (ndt) sarebbe da controllare meglio...
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Errore di sintassi %s:%u: la direttiva clear richiede un albero di opzioni "
+"come argomento"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, 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"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nessun portachiavi installato in %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Opzione a riga di comando \"%c\" [da %s] sconosciuta."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Opzione a riga di comando %s non comprensibile"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Opzione a riga di comando %s non booleana"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "L'opzione %s richiede un argomento."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"Opzione %s: la specifica di configurazione dell'oggetto deve avere un "
+"=<valore>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "L'opzione %s richiede un argomento intero, non \"%s\""
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opzione \"%s\" troppo lunga"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Il valore %s non è comprensibile, provare \"true\" o \"false\"."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Operazione %s non valida"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Uso: apt-extracttemplates FILE1 [FILE2 ...]\n"
+"\n"
+"apt-extracttemplates è uno strumento per estrarre configurazioni e template\n"
+"dai pacchetti debian\n"
+"\n"
+"Opzioni:\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"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Impossibile eseguire stat su %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Impossibile trovare la versione di debconf. È installato?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "L'elenco dell'estensione del pacchetto è troppo lungo"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Errore nell'elaborare la directory %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "L'elenco dell'estensione del sorgente è troppo lungo"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Errore nell'elaborare i contenuti %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 [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 ad alternative\n"
+"funzionali per dpkg-scanpackages e dpkg-scansources\n"
+"\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"
+"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. Il percorso al binario deve puntare alla base della ricerca \n"
+"ricorsiva e il file override deve contenere le opzioni di override.\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          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:812
+msgid "No selections matched"
+msgstr "Nessuna selezione corrisponde"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Mancano alcuni file nel file group di pacchetti \"%s\""
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Il database era danneggiato, il file è stato rinominato in %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Il database è vecchio, tentativo di aggiornamento %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Il formato del database non è valido. Se è stato eseguito l'aggiornamento da "
+"una vecchia versione di apt, rimuovere e ricreare il database."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Impossibile aprire il file del database %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "L'archivio non ha un campo \"control\""
+
+#: ftparchive/cachedb.cc:494
+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:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Impossibile leggere la directory %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "A: Impossibile eseguire stat su %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "A: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Gli errori si applicano al file "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Risoluzione di %s non riuscita"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Visita dell'albero non riuscita"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Apertura di %s non riuscita"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " Delink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Esecuzione di readlink su %s non riuscita"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Esecuzione di unlink su %s non riuscita"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Collegamento di %s a %s non riuscito"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Raggiunto il limite di DeLink di %sB.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "L'archivio non ha un campo \"package\""
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s non ha un campo override\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  il responsabile di %s è %s non %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s non ha un campo source override\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s non ha neppure un campo binario override\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Allocazione della memoria non riuscita"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Impossibile aprire %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Override %s riga %llu malformato #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Lettura del file override %s non riuscita"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Override %s riga %llu malformato #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Override %s riga %llu malformato #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Override %s riga %llu malformato #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmo di compressione \"%s\" sconosciuto"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "L'output compresso %s necessita di un insieme di compressione"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Creazione di FILE* non riuscita"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Fork non riuscita"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Sottoprocesso compresso"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Errore interno, creazione di %s non riuscita"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "I/O al sottoprocesso/file non riuscito"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Lettura durante l'elaborazione MD5 non riuscita"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problema nell'unlink di %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-internal-solver\n"
+"\n"
+"apt-internal-solver è un'interfaccia per l'utilizzo del resolver interno\n"
+"come resolver esterno per il debugging degli strumenti APT\n"
+"\n"
+"Opzioni:\n"
+"  -h   Mostra questo aiuto\n"
+"  -q   Output registrabile, nessun indicatore di avanzamento\n"
+"  -c=? Legge come configurazione il file specificato\n"
+"  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Record del pacchetto sconosciuto."
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Uso: apt-sortpkgs [OPZIONI] FILE1 [FILE2 ...]\n"
+"\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   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"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s non è un pacchetto DEB valido."
 
diff --git a/po/ja.po b/po/ja.po
index 517265903..82ee67dd5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,10 +6,10 @@
 # Debian Project, Kenshi Muto <kmuto@debian.org>, 2004-2012
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.9.9.4\n"
+"Project-Id-Version: apt 0.9.16.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
-"PO-Revision-Date: 2013-08-11 19:39+0900\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"PO-Revision-Date: 2014-03-21 19:53+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
 "Language: ja\n"
@@ -18,153 +18,154 @@ msgstr ""
 "Content-Transfer-Encoding: 8 bit\n"
 "Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "パッケージ名総数: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "パッケージ構造総数: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  通常パッケージ: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  純粋仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  単一仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  複合仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  欠落: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "個別バージョン総数: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "個別説明総数: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "依存関係総数: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "バージョン/ファイル関係総数: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "説明/ファイル関係総数: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "提供マッピング総数: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Glob 文字列の総数: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "総依存関係・バージョン容量: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "総空き容量: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "総占有容量: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Package ファイル %s が同期していません。"
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "パッケージが見つかりません"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "検索パターンはちょうど 1 つだけ指定してください"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "このコマンドは時代遅れです。'apt-mark showauto' を代わりに使用してください。"
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "パッケージ %s が見つかりません"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "パッケージファイル:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Pin されたパッケージ:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(見つかりません)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  インストールされているバージョン: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  候補: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(なし)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  パッケージ Pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  バージョンテーブル:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s コンパイル日時: %s %s\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -234,32 +235,34 @@ msgstr ""
 "  -o=? 指定した設定オプションを読み込む (例: -o dir::cache=/tmp)\n"
 "詳細は、apt-cache(8) や apt.conf(5) のマニュアルページを参照してください。\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-"CD-ROM が自動検出されなかったか、デフォルトで利用するマウントポイントに見当た"
-"りませんでした。CD-ROM のマウントポイントを設定するために --cdrom オプション"
-"を試すことができます。CD-ROM の自動検出およびマウントポイントの詳細について"
-"は、'man apt-cdrom' を参照してください。"
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "このディスクに、'Debian 5.0.3 Disk 1' のような名前を付けてください"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "ディスクをドライブに入れて Enter キーを押してください"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "'%s' を '%s' にマウントできませんでした"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+"CD-ROM が自動検出されなかったか、デフォルトで利用するマウントポイントに見当た"
+"りませんでした。\n"
+"CD-ROM のマウントポイントを設定するために --cdrom オプションを試すことができ"
+"ます。\n"
+"CD-ROM の自動検出およびマウントポイントの詳細については、'man apt-cdrom' を参"
+"照してください。"
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 "あなたの持っている CD セットの残り全部に、この手順を繰り返してください。"
@@ -296,47 +299,47 @@ msgstr ""
 "  -c=? 指定した設定ファイルを読み込む\n"
 "  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
 
-#: cmdline/apt-get.cc:244
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:245
+#, c-format
 msgid "Can not find a package for architecture '%s'"
-msgstr "正規表現 '%s' ではパッケージは見つかりませんでした"
+msgstr "アーキテクチャ '%s' 用のパッケージは見つかりませんでした"
 
-#: cmdline/apt-get.cc:326
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:327
+#, c-format
 msgid "Can not find a package '%s' with version '%s'"
-msgstr "正規表現 '%s' ではパッケージは見つかりませんでした"
+msgstr "パッケージ '%s' のバージョン '%s' は見つかりませんでした"
 
-#: cmdline/apt-get.cc:329
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:330
+#, c-format
 msgid "Can not find a package '%s' with release '%s'"
-msgstr "正規表現 '%s' ではパッケージは見つかりませんでした"
+msgstr "リリース '%2$s' にはパッケージ '%1$s' は見つかりませんでした"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "'%2$s' の代わりに '%1$s' をソースパッケージとして選出しています\n"
 
-#: cmdline/apt-get.cc:422
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:423
+#, c-format
 msgid "Can not find version '%s' of package '%s'"
-msgstr "パッケージ '%2$s' の利用できないバージョン '%1$s' を無視"
+msgstr "パッケージ '%2$s' のバージョン '%1$s' は見つかりませんでした"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "パッケージ %s が見つかりません"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s は手動でインストールしたと設定されました。\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s は自動でインストールしたと設定されました。\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -344,20 +347,20 @@ msgstr ""
 "このコマンドは時代遅れです。'apt-mark auto' および 'apt-mark manual' を代わり"
 "に使用してください。"
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部エラー、問題リゾルバが何かを破壊しました"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "ダウンロードディレクトリをロックできません"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s のソースパッケージが見つかりません"
@@ -384,80 +387,80 @@ msgstr ""
 "bzr branch %s\n"
 "を使用してください。\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s の空き領域を測定できません"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s に充分な空きスペースがありません"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB のソースアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ソース %s を取得\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "いくつかのアーカイブの取得に失敗しました。"
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "展開コマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 "'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ビルドコマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "子プロセスが失敗しました"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -466,17 +469,17 @@ msgstr ""
 "%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt."
 "conf(5) の APT::Architectures を参照してください。"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s のビルド依存情報を取得できません"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s にはビルド依存情報が指定されていません。\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,7 +488,7 @@ msgstr ""
 "パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s "
 "の依存関係を満たすことができません"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -494,14 +497,14 @@ msgstr ""
 "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
 "ができません"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -510,7 +513,7 @@ msgstr ""
 "パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた"
 "め、%2$s に対する %1$s の依存関係を満たすことができません"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -519,30 +522,30 @@ msgstr ""
 "パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関"
 "係を満たすことができません"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s のビルド依存関係を満たすことができませんでした。"
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "ビルド依存関係の処理に失敗しました"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) の変更履歴"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "サポートされているモジュール:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -634,54 +637,82 @@ msgstr ""
 "apt-get(8)、sources.list(5)、apt.conf(5) を参照してください。\n"
 "                        この APT は Super Cow Powers 化されています。\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+msgid "Must specify at least one pair url/filename"
+msgstr "少なくとも URL / ファイル名を 1 組指定する必要があります"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr "ダウンロード失敗"
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+"使用法: apt-helper [オプション] コマンド\n"
+"        apt-helper [オプション] download-file uri 目標パス\n"
+"\n"
+"apt-helper は apt の内部ヘルパーです\n"
+"\n"
+"コマンド:\n"
+"   download-file - 指定した uri を目標パスにダウンロードする\n"
+"\n"
+"                この APT helper は Super Meep Powers 化されています。\n"
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s をインストールされていないものとしてマークできません\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s は手動でインストールしたとすでに設定されています。\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s は自動でインストールしたとすでに設定されています。\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s はすでに保留に設定されています。\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s はすでに保留されていません。\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s を待ちましたが、そこにはありませんでした"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s は保留に設定されました。\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s の保留を解除しました。\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "dpkg の実行に失敗しました。root 権限で実行していますか?"
 
-#: cmdline/apt-mark.cc:381
-#, fuzzy
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -713,8 +744,15 @@ msgstr ""
 "する簡単なコマンドラインインターフェイスです。マークの一覧表示もできます。\n"
 "\n"
 "コマンド:\n"
-"   auto - 指定のパッケージを自動でインストールされたものとしてマークする\n"
-"   manual - 指定のパッケージを手動でインストールしたものとしてマークする\n"
+"   auto       - 指定のパッケージを自動でインストールされたものとしてマークす"
+"る\n"
+"   manual     - 指定のパッケージを手動でインストールしたものとしてマークす"
+"る\n"
+"   hold       - パッケージを保留としてマークする\n"
+"   unhold     - パッケージの保留を解除する\n"
+"   showauto   - 自動的にインストールされたパッケージの一覧を表示する\n"
+"   showmanual - 手作業でインストールしたパッケージの一覧を表示する\n"
+"   showhold   - 保留されているパッケージの一覧を表示する\n"
 "\n"
 "オプション:\n"
 "  -h  このヘルプを表示する\n"
@@ -727,7 +765,7 @@ msgstr ""
 "さらなる情報については、マニュアルページ apt-mark(8) および apt.conf(5) を参"
 "照してください。"
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -748,6 +786,24 @@ msgid ""
 "\n"
 " edit-sources - edit the source information file\n"
 msgstr ""
+"使用法: apt [オプション] コマンド\n"
+"\n"
+"apt 用コマンドラインインターフェイス\n"
+"基本コマンド: \n"
+" list   - パッケージ名を基にパッケージの一覧を表示\n"
+" search - パッケージの説明を検索\n"
+" show   - パッケージの詳細を表示\n"
+"\n"
+" update - 利用可能パッケージの一覧を更新\n"
+"\n"
+" install - パッケージをインストール\n"
+" remove  - パッケージを削除\n"
+"\n"
+" upgrade - パッケージをインストール/更新してシステムをアップグレード\n"
+" full-upgrade - パッケージを削除/インストール/更新してシステムをアップグレー"
+"ド\n"
+"\n"
+" edit-sources - ソース情報ファイルを編集\n"
 
 #: methods/cdrom.cc:203
 #, c-format
@@ -775,52 +831,52 @@ msgstr "%s の CD-ROM は使用中のためアンマウントすることがで�
 msgid "Disk not found."
 msgstr "ディスクが見つかりません。"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "ファイルが見つかりません"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "状態の取得に失敗しました"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "変更時刻の設定に失敗しました"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "不正な URI です。ローカルの URI は // で始まってはいけません"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "ログインしています"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "ピアネームを決定することができません"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "ローカルネームを決定することができません"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "サーバから接続を拒絶されました。応答: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 失敗、サーバ応答: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 失敗、サーバ応答: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -828,121 +884,123 @@ msgstr ""
 "プロキシサーバが指定されていますが、ログインスクリプトが設定されていません。"
 "Acquire::ftp::ProxyLogin が空です。"
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "ログインスクリプトのコマンド '%s' 失敗、サーバ応答: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 失敗、サーバ応答: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "接続タイムアウト"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "サーバが接続を切断しました"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "読み込みエラー"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "レスポンスがバッファをオーバフローさせました。"
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "プロトコルが壊れています"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "書き込みエラー"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "ソケットを作成できません"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "失敗"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "パッシブソケットに接続できません。"
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo はリスニングソケットを取得できませんでした"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "ソケットをバインドできませんでした"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "ソケットをリスンできませんでした"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "ソケットの名前を特定できませんでした"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "PORT コマンドを送信できません"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "未知のアドレスファミリ %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT に失敗しました。サーバ応答: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "データソケット接続タイムアウト"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "接続を accept できません"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "ファイルのハッシュでの問題"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "ファイルを取得できません。サーバ応答 '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "データソケットタイムアウト"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "データ転送に失敗しました。サーバ応答 '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "問い合わせ"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "呼び出せません"
 
@@ -978,7 +1036,7 @@ msgstr "%s:%s (%s) へ接続できませんでした。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s へ接続しています"
@@ -1008,23 +1066,23 @@ msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
 msgid "Unable to connect to %s:%s:"
 msgstr "%s:%s へ接続できません:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "少なくとも 1 つの不正な署名が発見されました。"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "署名を検証するための 'gpgv' の実行ができませんでした (gpgv はインストールされ"
 "ていますか?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1033,161 +1091,393 @@ msgstr ""
 "クリアサインされたファイルが有効ではなく、'%s' を得ました (認証にネットワーク"
 "が必要?)"
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "gpgv の実行中に未知のエラーが発生"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "以下の署名が無効です:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "空のファイルは有効なアーカイブと認められません"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "サーバからの読み込みに失敗しました"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "select に失敗しました"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "接続タイムアウト"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "出力ファイルへの書き込みでエラーが発生しました"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "ヘッダの待機中です"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "不正なヘッダ行です"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP サーバが不正なリプライヘッダを送信してきました"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP サーバが不正な Content-Length ヘッダを送信してきました"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP サーバが不正な Content-Range ヘッダを送信してきました"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "HTTP サーバのレンジサポートが壊れています"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "不明な日付フォーマットです"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "不正なヘッダです"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "内部エラー"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "アップグレードパッケージを検出しています ... "
+
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
+msgstr "内部エラー、アップグレードで何か壊れました"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "完了"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr "ソート中"
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
+msgstr "一覧表示"
+
+#: apt-private/private-list.cc:164
+#, fuzzy, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+"追加レコードが %i 件あります。表示するには '-a' スイッチを付けてください。"
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "依存関係を解決しています ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失敗しました。"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "依存関係を訂正できません"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "アップグレードセットを最小化できません"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完了"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
+"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
+"ん。"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "未解決の依存関係があります。-f オプションを試してください。"
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "不明"
+
+#: apt-private/private-output.cc:232
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[インストール済み、%s にアップグレード可]"
+
+#: apt-private/private-output.cc:236
+msgid "[installed,local]"
+msgstr "[インストール済み、ローカル]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr "[インストール済み、自動削除可]"
+
+#: apt-private/private-output.cc:241
+msgid "[installed,automatic]"
+msgstr "[インストール済み、自動]"
+
+#: apt-private/private-output.cc:243
+msgid "[installed]"
+msgstr "[インストール済み]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[%s からアップグレード可]"
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr "[設定未完了]"
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "以下のパッケージには満たせない依存関係があります:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "しかし、%s はインストールされています"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "しかし、%s はインストールされようとしています"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "しかし、インストールすることができません"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "しかし、これは仮想パッケージです"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "しかし、インストールされていません"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "しかし、インストールされようとしていません"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " または"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "以下のパッケージが新たにインストールされます:"
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "以下のパッケージは「削除」されます:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "以下のパッケージは保留されます:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "以下のパッケージはアップグレードされます:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "以下のパッケージは「ダウングレード」されます:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "以下の変更禁止パッケージは変更されます:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s のため) "
+
+#: apt-private/private-output.cc:662
+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"
+"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "再インストール: %lu 個、"
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "ダウングレード: %lu 個、"
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "削除: %lu 個、保留: %lu 個。\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "正規表現の展開エラー - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update コマンドは引数をとりません"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+"追加レコードが %i 件あります。表示するには '-a' スイッチを付けてください。"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "実際のパッケージではありません (仮想)"
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。"
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部エラー、調整が終わっていません"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%sB のアーカイブを取得する必要があります。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "この操作後に追加で %sB のディスク容量が消費されます。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "この操作後に %sB のディスク容量が解放されます。\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s に充分な空きスペースがありません。"
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。"
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1198,19 +1488,19 @@ msgstr ""
 "続行するには、'%s' というフレーズをタイプしてください。\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "中断しました。"
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "続行しますか?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "いくつかのファイルの取得に失敗しました"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1218,19 +1508,19 @@ msgstr ""
 "いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-"
 "missing オプションを付けて試してみてください。"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "足りないパッケージを直すことができません。"
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "インストールを中断します。"
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1241,16 +1531,16 @@ msgstr[0] ""
 "以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n"
 "システムから消えました:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "注意: これは dpkg により自動でわざと行われれます。"
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "一連のものを削除するようになっていないので、AutoRemover を開始できません"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1268,15 +1558,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部エラー、AutoRemover が何かを破壊しました"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1285,7 +1575,7 @@ msgid_plural ""
 msgstr[0] ""
 "以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1294,18 +1584,18 @@ msgstr[0] ""
 "%lu つのパッケージが自動でインストールされましたが、もう必要とされていませ"
 "ん:\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "これを削除するには 'apt-get autoremove' を利用してください。"
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
 "ません:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1313,7 +1603,7 @@ msgstr ""
 "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
 "を明示してください)。"
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1325,323 +1615,97 @@ msgstr ""
 "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
 "動されていないことが考えられます。"
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "壊れたパッケージ"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "以下の特別パッケージがインストールされます:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "提案パッケージ:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "推奨パッケージ:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"注意: これはシミュレーションにすぎません!\n"
+"      apt-get は実際の実行に root 権限を必要とします。\n"
+"      ロックが非アクティブであることから、今この時点の状態に妥当性が\n"
+"      あるとは言い切れないことに注意してください!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "警告: 以下のパッケージは認証されていません!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "認証の警告は上書きされました。\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "いくつかのパッケージを認証できませんでした"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "検証なしにこれらのパッケージをインストールしますか?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s の取得に失敗しました  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [インストール済み]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [インストール済み]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [インストール済み]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [インストール済み]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "以下のパッケージには満たせない依存関係があります:"
-
-#: apt-private/private-output.cc:410
+#: apt-private/private-sources.cc:58
 #, c-format
-msgid "but %s is installed"
-msgstr "しかし、%s はインストールされています"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "しかし、%s はインストールされようとしています"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "しかし、インストールすることができません"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "しかし、これは仮想パッケージです"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "しかし、インストールされていません"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "しかし、インストールされようとしていません"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " または"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "以下のパッケージが新たにインストールされます:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "以下のパッケージは「削除」されます:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "以下のパッケージは保留されます:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "以下のパッケージはアップグレードされます:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "以下のパッケージは「ダウングレード」されます:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "以下の変更禁止パッケージは変更されます:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s のため) "
-
-#: apt-private/private-output.cc:631
-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"
-"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "再インストール: %lu 個、"
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "ダウングレード: %lu 個、"
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "削除: %lu 個、保留: %lu 個。\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "正規表現の展開エラー - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "依存関係を解決しています ..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " 失敗しました。"
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "依存関係を訂正できません"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "アップグレードセットを最小化できません"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " 完了"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
-"ん。"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "未解決の依存関係があります。-f オプションを試してください。"
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "update コマンドは引数をとりません"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "アップグレードパッケージを検出しています ... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "内部エラー、AllUpgrade が何かを破壊しました"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "完了"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"注意: これはシミュレーションにすぎません!\n"
-"      apt-get は実際の実行に root 権限を必要とします。\n"
-"      ロックが非アクティブであることから、今この時点の状態に妥当性が\n"
-"      あるとは言い切れないことに注意してください!"
-
-#: apt-private/private-sources.cc:45
-#, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
-msgstr "%s を %s に名前変更できませんでした"
+msgstr "%s の解析に失敗しました。再編集しますか? "
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
+"'%s' ファイルが変更されています。「apt-get update」を実行してください。"
+
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr "全文検索"
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "ヒット "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "取得:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "無視 "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "エラー "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%sB を %s で取得しました (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [処理中]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1654,19 +1718,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s を読み込むことができません"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s へ変更することができません"
@@ -1695,11 +1759,11 @@ msgstr "ミラーファイル '%s' のエントリが見つかりません"
 msgid "[Mirror: %s]"
 msgstr "[ミラー: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "子プロセスへの IPC パイプの作成に失敗しました"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "途中で接続がクローズされました"
 
@@ -1737,1337 +1801,452 @@ msgstr "が重要です。これを修正して「導入」を再度実行して
 msgid "Merging available information"
 msgstr "入手可能情報をマージしています"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n"
-"\n"
-"apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n"
-"抽出するためのツールです\n"
-"\n"
-"オプション:\n"
-"  -h   このヘルプを表示する\n"
-"  -t   一時ディレクトリを指定する\n"
-"  -c=? 指定した設定ファイルを読み込む\n"
-"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s に書き込めません"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr ""
-"debconf のバージョンを取得できません。debconf はインストールされていますか?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "パッケージ拡張子リストが長すぎます"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "ディレクトリ %s の処理中にエラーが発生しました"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "ソース拡張子リストが長すぎます"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Contents %s の処理中にエラーが発生しました"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"使用方法: apt-ftparchive [オプション] コマンド\n"
-"コマンド: 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 は Debian アーカイブ用のインデックスファイルを生成しま\n"
-"す。全自動のものから、dpkg-scanpackages と dpkg-scansources の代替機能\n"
-"となるものまで、多くの生成方法をサポートしています。\n"
-"\n"
-"apt-ftparchive は .deb のツリーから Packages ファイルを生成します。\n"
-"Packages ファイルは MD5 ハッシュやファイルサイズに加えて、各パッケージ\n"
-"のすべての制御フィールドの内容を含んでいます。Priority と Section の値\n"
-"を強制するために override ファイルがサポートされています。\n"
-"\n"
-"同様に apt-ftparchive は .dsc のツリーから Sources ファイルを生成しま\n"
-"す。--source-override オプションを使用するとソース override ファイルを\n"
-"指定できます。\n"
-"\n"
-"'packages' および 'sources' コマンドはツリーのルートで実行する必要があ\n"
-"ります。BinaryPath には再帰検索のベースディレクトリを指定し、override \n"
-"ファイルは override フラグを含んでいる必要があります。もし pathprefix \n"
-"が存在すればファイル名フィールドに付加されます。debian アーカイブでの\n"
-"使用方法の例:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"オプション:\n"
-"  -h このヘルプを表示する\n"
-"  --md5 MD5 の生成を制御する\n"
-"  -s=?  ソース override ファイル\n"
-"  -q    表示を抑制する\n"
-"  -d=?  オプションのキャッシュデータベースを選択する\n"
-"  --no-delink delinking デバッグモードを有効にする\n"
-"  --contents  contents ファイルの生成を制御する\n"
-"  -c=? 指定の設定ファイルを読む\n"
-"  -o=? 任意の設定オプションを設定する"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "選択にマッチするものがありません"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB が古いため、%s のアップグレードを試みます"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ"
-"ベースを削除し、再作成してください。"
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "DB ファイル %s を開くことができません: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%s の状態を取得するのに失敗しました"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "アーカイブにコントロールレコードがありません"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "カーソルを取得できません"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "警告: ディレクトリ %s が読めません\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "警告: %s の状態を取得できません\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "エラー: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "警告: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "エラー: エラーが適用されるファイルは "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s の解決に失敗しました"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "ツリー内での移動に失敗しました"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s のオープンに失敗しました"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " リンク %s [%s] を外します\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "%s のリンク読み取りに失敗しました"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "%s のリンク解除に失敗しました"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s を %s にリンクするのに失敗しました"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " リンクを外す制限の %sB に到達しました。\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "アーカイブにパッケージフィールドがありませんでした"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s に override エントリがありません\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %1$s メンテナは %3$s ではなく %2$s です\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s にソース override エントリがありません\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s にバイナリ override エントリがありません\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - メモリの割り当てに失敗しました"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "'%s' をオープンできません"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "不正な override %s %llu 行目 #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "override ファイル %s を読み込むのに失敗しました"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "不正な override %s %llu 行目 #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "不正な override %s %llu 行目 #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "不正な override %s %llu 行目 #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' は未知の圧縮アルゴリズムです"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "圧縮出力 %s には圧縮セットが必要です"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "FILE* の作成に失敗しました"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "fork に失敗しました"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "圧縮子プロセス"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "内部エラー、%s の作成に失敗しました"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "子プロセス/ファイルへの IO が失敗しました"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "MD5 の計算中に読み込みに失敗しました"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "%s のリンク解除で問題が発生しました"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "%s を %s に名前変更できませんでした"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"使用方法: apt-internal-solver\n"
-"\n"
-"apt-internal-solver は、デバッグなどの用途で、現在の内部リゾルバを\n"
-"APT ファミリの外部リゾルバのように使うためのインターフェイスです。\n"
-"\n"
-"オプション:\n"
-"  -h   このヘルプを表示する\n"
-"  -q   ログファイルに出力可能な形式にする - プログレス表示をしない\n"
-"  -c=? 指定した設定ファイルを読み込む\n"
-"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "不明なパッケージレコードです!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"使用方法: apt-sortpkgs [オプション] ファイル名1 [ファイル名2 ...]\n"
-"\n"
-"apt-sortpkgs はパッケージファイルをソートするための簡単なツールです。\n"
-"-s オプションはファイルの種類を示すために使用されます。\n"
-"\n"
-"オプション:\n"
-"  -h   このヘルプを表示する\n"
-"  -s   ソースファイルソートを使用する\n"
-"  -c=? 指定した設定ファイルを読み込む\n"
-"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "パイプの生成に失敗しました"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "gzip の実行に失敗しました"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "壊れたアーカイブ"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "tar チェックサム検証が失敗しました。アーカイブが壊れています"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "未知の TAR ヘッダタイプ %u、メンバー %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "不正なアーカイブ署名"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "アーカイブメンバーヘッダの読み込みに失敗しました"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "不正なアーカイブメンバーヘッダ %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "不正なアーカイブメンバーヘッダ"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "アーカイブが不足しています"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "アーカイブヘッダの読み込みに失敗しました"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "リンクされているノードで DropNode が呼ばれました"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "ハッシュ要素を特定することができません!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "diversion の割り当てに失敗しました"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "AddDiversion での内部エラー"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "%s -> %s と %s/%s の diversion を上書きしようとしています"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "%s -> %s の diversion が二重に追加されています"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "設定ファイル %s/%s が重複しています"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "ファイル %s の書き込みに失敗しました"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "%s のクローズに失敗しました"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "パス %s は長すぎます"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s を複数回展開しています"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "ディレクトリ %s は divert されています"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 "このパッケージは diversion のターゲットの %s/%s に書き込もうとしています"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "diversion パスが長すぎます"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s の状態を取得するのに失敗しました"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s を %s に名前変更できませんでした"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "ハッシュバケツ内でノードを特定するのに失敗しました"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "パスが長すぎます"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "%s に対するバージョンのないパッケージマッチを上書きします"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ファイル %s/%s がパッケージ %s のものを上書きします"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s の状態を取得できません"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "ファイル %s の書き込みに失敗しました"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "%s のクローズに失敗しました"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "内部エラー、メンバー %s を特定できません"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "解析できないコントロールファイル"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "空のファイルを mmap できません"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "ファイルデスクリプタ %i は重複できません"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "%llu バイトの mmap ができませんでした"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "mmap をクローズできません"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "mmap を同期できません"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "%lu バイトの mmap ができませんでした"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "不正なアーカイブ署名"
 
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "ファイルの切り詰めに失敗しました"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "アーカイブメンバーヘッダの読み込みに失敗しました"
 
-#: apt-pkg/contrib/mmap.cc:341
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"動的 MMap が範囲を越えました。APT::Cache-Start の大きさを増やしてください。現"
-"在値は %lu です (man 5 apt.conf を参照)。"
+msgid "Invalid archive member header %s"
+msgstr "不正なアーカイブメンバーヘッダ %s"
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr "%lu バイトの上限に達しているため、MMap のサイズを増やせません。"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "不正なアーカイブメンバーヘッダ"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"自動増加がユーザによって無効にされているため、MMap のサイズを増やせません。"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "アーカイブが不足しています"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li日 %li時間 %li分 %li秒"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "アーカイブヘッダの読み込みに失敗しました"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li時間 %li分 %li秒"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "パイプの生成に失敗しました"
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%li分 %li秒"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "gzip の実行に失敗しました"
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%li秒"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "壊れたアーカイブ"
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "選択された %s が見つかりません"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "tar チェックサム検証が失敗しました。アーカイブが壊れています"
 
-#: apt-pkg/contrib/configuration.cc:503
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "理解できない省略形式です: '%c'"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "未知の TAR ヘッダタイプ %u、メンバー %s"
 
-#: apt-pkg/contrib/configuration.cc:617
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "設定ファイル %s をオープンできませんでした"
+msgid "Unable to stat %s."
+msgstr "%s の状態を取得できません。"
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。"
+msgid "Progress: [%3i%%]"
+msgstr "進捗: [%3i%%]"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "文法エラー %s:%u: 不正なタグです"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "dpkg を実行しています"
 
-#: apt-pkg/contrib/configuration.cc:821
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています"
+msgid "Packaging system '%s' is not supported"
+msgstr "パッケージングシステム '%s' はサポートされていません"
 
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "適切なパッケージシステムタイプを特定できません"
 
-#: apt-pkg/contrib/configuration.cc:868
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "文法エラー %s:%u: インクルードのネストが多すぎます"
+msgid "Wrote %i records.\n"
+msgstr "%i レコードを書き込みました。\n"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "文法エラー %s:%u: ここからインクルードされています"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "文法エラー %s:%u: 未対応の命令 '%s'"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"文法エラー %s:%u: clear ディレクティブは、引数としてオプションツリーを必要と"
-"します"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... エラー!"
-
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... 完了"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr "..."
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... %u%%"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "コマンドラインオプション '%c' [%s から] は不明です。"
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "コマンドラインオプション %s を理解できません"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "コマンドラインオプション %s は boolean ではありません"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "オプション %s には引数が必要です。"
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "オプション %s: 設定項目には =<値> を指定する必要があります。"
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "オプション %s には '%s' ではなく整数の引数が必要です"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "オプション '%s' は長すぎます"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "%s を解釈することができません。true か false を試してください。"
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "不正な操作 %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "マウントポイント %s の状態を取得できません"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "CD-ROM の状態を取得するのに失敗しました"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "gzip ファイル %s のクローズ中に問題が発生しました"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "読み込み専用のロックファイル %s にロックは使用しません"
+"%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない"
+"ファイルがあります。\n"
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open lock file %s"
-msgstr "ロックファイル %s をオープンできません"
+msgid "Can't find authentication record for: %s"
+msgstr "認証レコードが見つかりません: %s"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "nfs マウントされたロックファイル %s にはロックを使用しません"
+msgid "Hash mismatch for: %s"
+msgstr "ハッシュサムが適合しません: %s"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not get lock %s"
-msgstr "ロック %s が取得できませんでした"
+msgid "The method driver %s could not be found."
+msgstr "メソッドドライバ %s が見つかりません。"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "'%s' がディレクトリではないため、ファイルの一覧を作成できません"
+msgid "Is the package %s installed?"
+msgstr "パッケージ %s はインストールされていますか?"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "ディレクトリ '%2$s' の '%1$s' が通常ファイルではないため、無視します"
+msgid "Method %s did not start correctly"
+msgstr "メソッド %s が正常に開始しませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"ディレクトリ '%2$s' の '%1$s' がファイル名拡張子を持たないため、無視します"
+"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ"
+"さい。"
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"ディレクトリ '%2$s' の '%1$s' が無効なファイル名拡張子を持っているため、無視"
-"します"
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "子プロセス %s がセグメンテーション違反を受け取りました。"
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "子プロセス %s がシグナル %u を受け取りました。"
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "子プロセス %s がエラーコード (%u) を返しました"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "子プロセス %s が予期せず終了しました"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "ファイル %s をオープンできませんでした"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "ファイルデスクリプタ %d を開けませんでした"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "子プロセス IPC の生成に失敗しました"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "以下の圧縮ツールの実行に失敗しました: "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "読み込みが %llu 残っているはずですが、何も残っていません"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "ファイル %s のクローズ中に問題が発生しました"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "%s から %s へのファイル名変更中に問題が発生しました"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "ファイル %s の削除中に問題が発生しました"
+"パッケージリストまたはステータスファイルを解釈またはオープンすることができま"
+"せん。"
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "ファイルの同期中に問題が発生しました"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"これらの問題を解決するためには apt-get update を実行する必要があるかもしれま"
+"せん"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s にキーリングがインストールされていません。"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "ソースのリストを読むことができません。"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "空のパッケージキャッシュ"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "パッケージキャッシュファイルが壊れています"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "このパッケージキャッシュファイルは互換性がないバージョンです"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "パッケージキャッシュファイルが壊れています。短かすぎます"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "この APT はバージョニングシステム '%s' をサポートしていません"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "依存"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "先行依存"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "提案"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "推奨"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "競合"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "置換"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "廃止"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "破壊"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "拡張"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "要求"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "標準"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "任意"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "特別"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "依存関係ツリーを作成しています"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "候補バージョン"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "依存関係の生成"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "状態情報を読み取っています"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "状態ファイル %s のオープンに失敗しました"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "一時状態ファイル %s の書き込みに失敗しました"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "パッケージファイル %s を解釈することができません (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "パッケージファイル %s を解釈することができません (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "%s をオープンしています"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::"
-"Immediate-Configure の項を参照してください。(%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "'%s' を設定できませんでした。"
-
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"このインストールは、競合/先行依存のループが原因で、一時的に重要な不可欠パッ"
-"ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に"
-"これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。"
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
-"つけることができませんでした。"
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
-"ジが原因です。"
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "リストディレクトリ %spartial が見つかりません。"
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "アーカイブディレクトリ %spartial が見つかりません。"
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "ディレクトリ %s をロックできません"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "ファイルを取得しています %li/%li (残り %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "ファイルを取得しています %li/%li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "メソッドドライバ %s が見つかりません。"
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-"'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "メソッド %s が正常に開始しませんでした"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ"
-"さい。"
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "パッケージングシステム '%s' はサポートされていません"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "適切なパッケージシステムタイプを特定できません"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s の状態を取得できません。"
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "sources.list に 'ソース' URI を指定する必要があります"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"パッケージリストまたはステータスファイルを解釈またはオープンすることができま"
-"せん。"
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"これらの問題を解決するためには apt-get update を実行する必要があるかもしれま"
-"せん"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "ソースのリストを読むことができません。"
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"APT::Default-Release の 値 '%s' は、そのようなリリースをソース中から利用でき"
-"ないため、無効です"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-"不正なレコードがプリファレンスファイル %s に存在します。パッケージヘッダがあ"
-"りません"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "pin タイプ %s を理解できませんでした"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "pin で優先度 (または 0) が指定されていません"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "キャッシュに非互換なバージョニングシステムがあります"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "%s を処理中にエラーが発生しました (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "この APT が対応している以上の数のパッケージが指定されました。"
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "この APT が対応している以上の数のバージョンが要求されました。"
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "この APT が対応している以上の数の説明が要求されました。"
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "この APT が対応している以上の数の依存関係が発生しました。"
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "ソースパッケージリスト %s の状態を取得できません"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "パッケージリストを読み込んでいます"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "ファイル提供情報を収集しています"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s に書き込めません"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "ソルバにシナリオを送信"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "ソルバにリクエストを送信"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "解決を受け取る準備"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "外部ソルバを実行"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "名前の変更に失敗しました。%s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "ハッシュサムが適合しません"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "サイズが適合しません"
 
-#: apt-pkg/acquire-item.cc:164
-#, fuzzy
+#: apt-pkg/acquire-item.cc:173
 msgid "Invalid file format"
-msgstr "不正な操作 %s"
+msgstr "不正なファイル形式"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3076,16 +2255,16 @@ msgstr ""
 "期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った "
 "sources.list エントリか、壊れたファイル)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3094,14 +2273,14 @@ msgstr ""
 "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新"
 "物は適用されません。"
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し"
 "ました)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3111,12 +2290,12 @@ msgstr ""
 "ファイルが使われます。GPG エラー: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG エラー: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3125,12 +2304,12 @@ msgstr ""
 "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
 "で修正する必要があります (存在しないアーキテクチャのため)。"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3138,71 +2317,136 @@ msgstr ""
 "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
 "フィールドがありません。"
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release ファイル %s を解釈することができません"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "ベンダブロック %s は鍵指紋を含んでいません"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Release ファイル %s にセクションがありません"
+msgid "List directory %spartial is missing."
+msgstr "リストディレクトリ %spartial が見つかりません。"
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release ファイル %s に Hash エントリがありません"
+msgid "Archives directory %spartial is missing."
+msgstr "アーカイブディレクトリ %spartial が見つかりません。"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
+msgid "Unable to lock directory %s"
+msgstr "ディレクトリ %s をロックできません"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Release ファイル %s に無効な 'Date' エントリがあります"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "ファイルを取得しています %li/%li (残り %s)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "ベンダブロック %s は鍵指紋を含んでいません"
+msgid "Retrieving file %li of %li"
+msgstr "ファイルを取得しています %li/%li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され"
+"るか、古いものが代わりに使われます。"
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "sources.list に 'ソース' URI を指定する必要があります"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"APT::Default-Release の 値 '%s' は、そのようなリリースをソース中から利用でき"
+"ないため、無効です"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
+"不正なレコードがプリファレンスファイル %s に存在します。パッケージヘッダがあ"
+"りません"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "pin タイプ %s を理解できませんでした"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "pin で優先度 (または 0) が指定されていません"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::"
+"Immediate-Configure の項を参照してください。(%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "'%s' を設定できませんでした。"
+
+#: apt-pkg/packagemanager.cc:577
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"このインストールは、競合/先行依存のループが原因で、一時的に重要な不可欠パッ"
+"ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に"
+"これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。"
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM をアンマウントしています ...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "CD-ROM マウントポイント %s を使用します\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "CD-ROM をアンマウントしています\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "ディスクを待っています ...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "CD-ROM をマウントしています ...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "確認しています.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "確認しています... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "格納されたラベル: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM をアンマウントしています ...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "ディスクのインデックスファイルを走査しています ..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "ディスクのインデックスファイルを走査しています ...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3211,7 +2455,7 @@ msgstr ""
 "%zu のパッケージインデックス、%zu のソースインデックス、%zu の翻訳インデック"
 "ス、%zu の署名を見つけました\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3219,16 +2463,16 @@ msgstr ""
 "パッケージファイルを配置できません。Debian のディスクではないか、誤ったアーキ"
 "テクチャではないでしょうか?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "ラベル '%s' を見つけました\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "これは有効な名前ではありません。再試行してください。\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3237,81 +2481,105 @@ msgstr ""
 "このディスクは以下のように呼ばれます: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "パッケージリストをコピーしています ..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "新しいソースリストを書き込んでいます\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "このディスクのソースリストのエントリ:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i レコードを書き込みました。\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
+"つけることができませんでした。"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
+"ジが原因です。"
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "依存関係ツリーを作成しています"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候補バージョン"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "依存関係の生成"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "状態情報を読み取っています"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
+msgid "Failed to open StateFile %s"
+msgstr "状態ファイル %s のオープンに失敗しました"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない"
-"ファイルがあります。\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "一時状態ファイル %s の書き込みに失敗しました"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "認証レコードが見つかりません: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "パッケージファイル %s を解釈することができません (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "ハッシュサムが適合しません: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "パッケージファイル %s を解釈することができません (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "タスク '%s' が見つかりません"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "正規表現 '%s' ではパッケージは見つかりませんでした"
 
-#: apt-pkg/cacheset.cc:605
-#, fuzzy, c-format
+#: apt-pkg/cacheset.cc:615
+#, c-format
 msgid "Couldn't find any package by glob '%s'"
-msgstr "正規表現 '%s' ではパッケージは見つかりませんでした"
+msgstr "'%s' に一致するパッケージは見つかりませんでした"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3320,173 +2588,240 @@ msgstr ""
 "パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない"
 "ので選べません"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "インストールされていないので、パッケージ %s のインストール済みバージョンを選"
 "べません。"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "ソルバにシナリオを送信"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Release ファイル %s を解釈することができません"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "ソルバにリクエストを送信"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Release ファイル %s にセクションがありません"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "解決を受け取る準備"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Release ファイル %s に Hash エントリがありません"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "外部ソルバを実行"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Release ファイル %s に無効な 'Date' エントリがあります"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "ソースリスト %2$s の %1$u 個目の区切りが不正です (URI parse)"
+
+#: apt-pkg/sourcelist.cc:170
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "dpkg を実行しています"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
-"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され"
-"るか、古いものが代わりに使われます。"
+"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s をオープンしています"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ソースリスト %3$s の %2$u 個目の節 '%1$s' は不明です"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "%s をインストールしています"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "%s を設定しています"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "%s を削除しています"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s を完全に削除しています"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s の消失を記録しています"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "インストール後トリガ %s を実行しています"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ディレクトリ '%s' が見つかりません"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "ファイル '%s' をオープンできませんでした"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "%s を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s を展開しています"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s の設定を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s をインストールしました"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s の削除を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s を削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s を完全に削除する準備をしています"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s を完全に削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
+msgstr "ioctl(TIOCGWINSZ) に失敗しました"
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#, c-format
 msgid "Can not write log (%s)"
-msgstr "%s に書き込めません"
+msgstr "ログを書き込めません (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
-msgstr ""
+msgstr "/dev/pts はマウントされていますか?"
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
-msgstr ""
+msgstr "標準出力はターミナルですか?"
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "操作はそれが完了する前に中断されました"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "MaxReports にすでに達しているため、レポートは書き込まれません"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "依存関係の問題 - 未設定のままにしています"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3494,7 +2829,7 @@ msgstr ""
 "エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート"
 "は書き込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3502,7 +2837,7 @@ msgstr ""
 "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
 "き込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3510,23 +2845,22 @@ msgstr ""
 "エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き"
 "込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
-"エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
-"き込まれません。"
+"エラーメッセージはローカルシステムの問題であることを示しているので、レポート"
+"は書き込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "エラーメッセージは dpkg I/O エラーであることを示しているので、レポートは書き"
 "込まれません。"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3535,7 +2869,7 @@ msgstr ""
 "管理用ディレクトリ (%s) をロックできません。これを使う別のプロセスが動いてい"
 "ませんか?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3543,7 +2877,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3551,122 +2885,734 @@ msgstr ""
 "dpkg は中断されました。問題を修正するには '%s' を手動で実行する必要がありま"
 "す。"
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "ロックされていません"
 
-#~ msgid "%s not a valid DEB package."
-#~ msgstr "%s は正しい DEB パッケージではありません。"
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li時間 %li分 %li秒"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li秒"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "選択された %s が見つかりません"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "読み込み専用のロックファイル %s にロックは使用しません"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "ロックファイル %s をオープンできません"
 
-#~ msgid ""
-#~ "Using CD-ROM mount point %s\n"
-#~ "Mounting CD-ROM\n"
-#~ msgstr ""
-#~ "CD-ROM マウントポイント %s を使用します\n"
-#~ "CD-ROM をマウントしています\n"
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "nfs マウントされたロックファイル %s にはロックを使用しません"
 
-#~ msgid ""
-#~ "Could not patch %s with mmap and with file operation usage - the patch "
-#~ "seems to be corrupt."
-#~ msgstr ""
-#~ "mmap およびファイル操作用法へのパッチ %s を適用できません - パッチが壊れて"
-#~ "いるようです。"
-
-#~ msgid ""
-#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
-#~ "seems to be corrupt."
-#~ msgstr ""
-#~ "mmap へのパッチ %s を適用できません (しかし mmap 固有の失敗ではありませ"
-#~ "ん) - パッチが壊れているようです。"
-
-#~ msgid "Note, selecting '%s' for task '%s'\n"
-#~ msgstr "注意: タスク '%2$s' に対して '%1$s' を選択しています\n"
-
-#~ msgid "Note, selecting '%s' for regex '%s'\n"
-#~ msgstr "注意: 正規表現 '%2$s' に対して '%1$s' を選択しています\n"
-
-#~ msgid "Package %s is a virtual package provided by:\n"
-#~ msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n"
-
-#~ msgid " [Not candidate version]"
-#~ msgstr "[候補バージョンなし]"
-
-#~ msgid "You should explicitly select one to install."
-#~ msgstr "インストールするパッケージを明示的に選択する必要があります。"
-
-#~ 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"
-
-#~ msgid "However the following packages replace it:"
-#~ msgstr "しかし、以下のパッケージで置き換えられています:"
-
-#~ msgid "Package '%s' has no installation candidate"
-#~ msgstr "パッケージ '%s' にはインストール候補がありません"
-
-#~ msgid "Virtual packages like '%s' can't be removed\n"
-#~ msgstr "'%s' のような仮想パッケージは削除できません\n"
-
-#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-#~ msgstr ""
-#~ "パッケージ %s はインストールされていないため、削除はできません。'%s' のこ"
-#~ "とでしょうか?\n"
-
-#~ msgid "Package '%s' is not installed, so not removed\n"
-#~ msgstr "パッケージ '%s' はインストールされていないため、削除はできません\n"
-
-#~ msgid "Note, selecting '%s' instead of '%s'\n"
-#~ msgstr "注意、'%2$s' の代わりに '%1$s' を選択しています\n"
-
-#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-#~ msgstr ""
-#~ "すでにインストールされておりアップグレードも設定されていないため、%s をス"
-#~ "キップします。\n"
-
-#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-#~ msgstr ""
-#~ "%s はインストールされていないのにアップグレードだけが要求されているので、"
-#~ "スキップします。\n"
-
-#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-#~ msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n"
-
-#~ msgid "%s is already the newest version.\n"
-#~ msgstr "%s はすでに最新バージョンです。\n"
-
-#~ msgid "Selected version '%s' (%s) for '%s'\n"
-#~ msgstr "'%3$s' にはバージョン '%1$s' (%2$s) を選択しました\n"
-
-#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-#~ msgstr "'%4$s' のため、'%3$s' にはバージョン '%1$s' (%2$s) を選択しました\n"
-
-#~ msgid "Ignore unavailable target release '%s' of package '%s'"
-#~ msgstr "パッケージ '%2$s' の利用できないターゲットリリース '%1$s' を無視"
-
-#~ msgid "Downloading %s %s"
-#~ msgstr "%s %s をダウンロードしています"
-
-#~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-#~ msgstr ""
-#~ "これは正しい DEB アーカイブではありません。'%s'、'%s'、'%s' のいずれのメン"
-#~ "バーもありません"
-
-#~ msgid "MD5Sum mismatch"
-#~ msgstr "MD5Sum が適合しません"
-
-#~ msgid ""
-#~ "I wasn't able to locate a file for the %s package. This might mean you "
-#~ "need to manually fix this package."
-#~ msgstr ""
-#~ "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手"
-#~ "動で修正する必要があります。"
-
-#~ msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-#~ msgstr ""
-#~ "ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされて"
-#~ "いない?)\n"
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "ロック %s が取得できませんでした"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "'%s' がディレクトリではないため、ファイルの一覧を作成できません"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "ディレクトリ '%2$s' の '%1$s' が通常ファイルではないため、無視します"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+"ディレクトリ '%2$s' の '%1$s' がファイル名拡張子を持たないため、無視します"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"ディレクトリ '%2$s' の '%1$s' が無効なファイル名拡張子を持っているため、無視"
+"します"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "子プロセス %s がセグメンテーション違反を受け取りました。"
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "子プロセス %s がシグナル %u を受け取りました。"
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "子プロセス %s がエラーコード (%u) を返しました"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "子プロセス %s が予期せず終了しました"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "gzip ファイル %s のクローズ中に問題が発生しました"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "ファイル %s をオープンできませんでした"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "ファイルデスクリプタ %d を開けませんでした"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "子プロセス IPC の生成に失敗しました"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "以下の圧縮ツールの実行に失敗しました: "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "読み込みが %llu 残っているはずですが、何も残っていません"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "ファイル %s のクローズ中に問題が発生しました"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "%s から %s へのファイル名変更中に問題が発生しました"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "ファイル %s の削除中に問題が発生しました"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "ファイルの同期中に問題が発生しました"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... エラー!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... 完了"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr "..."
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "空のファイルを mmap できません"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "ファイルデスクリプタ %i は重複できません"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "%llu バイトの mmap ができませんでした"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "mmap をクローズできません"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "mmap を同期できません"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "%lu バイトの mmap ができませんでした"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "ファイルの切り詰めに失敗しました"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"動的 MMap が範囲を越えました。APT::Cache-Start の大きさを増やしてください。現"
+"在値は %lu です (man 5 apt.conf を参照)。"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr "%lu バイトの上限に達しているため、MMap のサイズを増やせません。"
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"自動増加がユーザによって無効にされているため、MMap のサイズを増やせません。"
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "マウントポイント %s の状態を取得できません"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "CD-ROM の状態を取得するのに失敗しました"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "理解できない省略形式です: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "設定ファイル %s をオープンできませんでした"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。"
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "文法エラー %s:%u: 不正なタグです"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "文法エラー %s:%u: インクルードのネストが多すぎます"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "文法エラー %s:%u: ここからインクルードされています"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "文法エラー %s:%u: 未対応の命令 '%s'"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"文法エラー %s:%u: clear ディレクティブは、引数としてオプションツリーを必要と"
+"します"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s にキーリングがインストールされていません。"
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "コマンドラインオプション '%c' [%s から] は不明です。"
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "コマンドラインオプション %s を理解できません"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "コマンドラインオプション %s は boolean ではありません"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "オプション %s には引数が必要です。"
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "オプション %s: 設定項目には =<値> を指定する必要があります。"
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "オプション %s には '%s' ではなく整数の引数が必要です"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "オプション '%s' は長すぎます"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "%s を解釈することができません。true か false を試してください。"
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "不正な操作 %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n"
+"\n"
+"apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n"
+"抽出するためのツールです\n"
+"\n"
+"オプション:\n"
+"  -h   このヘルプを表示する\n"
+"  -t   一時ディレクトリを指定する\n"
+"  -c=? 指定した設定ファイルを読み込む\n"
+"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s の状態を取得できません"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr ""
+"debconf のバージョンを取得できません。debconf はインストールされていますか?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "パッケージ拡張子リストが長すぎます"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "ディレクトリ %s の処理中にエラーが発生しました"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "ソース拡張子リストが長すぎます"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Contents %s の処理中にエラーが発生しました"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"使用方法: apt-ftparchive [オプション] コマンド\n"
+"コマンド: 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 は Debian アーカイブ用のインデックスファイルを生成しま\n"
+"す。全自動のものから、dpkg-scanpackages と dpkg-scansources の代替機能\n"
+"となるものまで、多くの生成方法をサポートしています。\n"
+"\n"
+"apt-ftparchive は .deb のツリーから Packages ファイルを生成します。\n"
+"Packages ファイルは MD5 ハッシュやファイルサイズに加えて、各パッケージ\n"
+"のすべての制御フィールドの内容を含んでいます。Priority と Section の値\n"
+"を強制するために override ファイルがサポートされています。\n"
+"\n"
+"同様に apt-ftparchive は .dsc のツリーから Sources ファイルを生成しま\n"
+"す。--source-override オプションを使用するとソース override ファイルを\n"
+"指定できます。\n"
+"\n"
+"'packages' および 'sources' コマンドはツリーのルートで実行する必要があ\n"
+"ります。BinaryPath には再帰検索のベースディレクトリを指定し、override \n"
+"ファイルは override フラグを含んでいる必要があります。もし pathprefix \n"
+"が存在すればファイル名フィールドに付加されます。debian アーカイブでの\n"
+"使用方法の例:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"オプション:\n"
+"  -h このヘルプを表示する\n"
+"  --md5 MD5 の生成を制御する\n"
+"  -s=?  ソース override ファイル\n"
+"  -q    表示を抑制する\n"
+"  -d=?  オプションのキャッシュデータベースを選択する\n"
+"  --no-delink delinking デバッグモードを有効にする\n"
+"  --contents  contents ファイルの生成を制御する\n"
+"  -c=? 指定の設定ファイルを読む\n"
+"  -o=? 任意の設定オプションを設定する"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "選択にマッチするものがありません"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB が古いため、%s のアップグレードを試みます"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ"
+"ベースを削除し、再作成してください。"
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "DB ファイル %s を開くことができません: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "アーカイブにコントロールレコードがありません"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "カーソルを取得できません"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "警告: ディレクトリ %s が読めません\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "警告: %s の状態を取得できません\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "エラー: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "警告: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "エラー: エラーが適用されるファイルは "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "%s の解決に失敗しました"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "ツリー内での移動に失敗しました"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s のオープンに失敗しました"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " リンク %s [%s] を外します\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "%s のリンク読み取りに失敗しました"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "%s のリンク解除に失敗しました"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s を %s にリンクするのに失敗しました"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " リンクを外す制限の %sB に到達しました。\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "アーカイブにパッケージフィールドがありませんでした"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s に override エントリがありません\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %1$s メンテナは %3$s ではなく %2$s です\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s にソース override エントリがありません\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s にバイナリ override エントリがありません\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - メモリの割り当てに失敗しました"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "'%s' をオープンできません"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "不正な override %s %llu 行目 (%s)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "override ファイル %s を読み込むのに失敗しました"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "不正な override %s %llu 行目 #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "不正な override %s %llu 行目 #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "不正な override %s %llu 行目 #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "'%s' は未知の圧縮アルゴリズムです"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "圧縮出力 %s には圧縮セットが必要です"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "FILE* の作成に失敗しました"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "fork に失敗しました"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "圧縮子プロセス"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "内部エラー、%s の作成に失敗しました"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "子プロセス/ファイルへの IO が失敗しました"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "MD5 の計算中に読み込みに失敗しました"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "%s のリンク解除で問題が発生しました"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"使用方法: apt-internal-solver\n"
+"\n"
+"apt-internal-solver は、デバッグなどの用途で、現在の内部リゾルバを\n"
+"APT ファミリの外部リゾルバのように使うためのインターフェイスです。\n"
+"\n"
+"オプション:\n"
+"  -h   このヘルプを表示する\n"
+"  -q   ログファイルに出力可能な形式にする - プログレス表示をしない\n"
+"  -c=? 指定した設定ファイルを読み込む\n"
+"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "不明なパッケージレコードです!"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"使用方法: apt-sortpkgs [オプション] ファイル名1 [ファイル名2 ...]\n"
+"\n"
+"apt-sortpkgs はパッケージファイルをソートするための簡単なツールです。\n"
+"-s オプションはファイルの種類を示すために使用されます。\n"
+"\n"
+"オプション:\n"
+"  -h   このヘルプを表示する\n"
+"  -s   ソースファイルソートを使用する\n"
+"  -c=? 指定した設定ファイルを読み込む\n"
+"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
diff --git a/po/km.po b/po/km.po
index 321a989c3..6e2927684 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -20,156 +20,157 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "កញ្ចប់ %s កំណែ %s មាន​ភាព​អាស្រ័យ​មិន​ត្រូវ​គ្នា ៖\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  កញ្ចប់​ធម្មតា ៖ "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​សុទ្ធ ៖ "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​តែ​មួយ ៖ "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​លាយ ៖ "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  បាត់បង់ ៖ "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "ភាព​អាស្រ័យ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "ការផ្គូរផ្គង​ការផ្ដល់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "ខ្សែ​អក្សរ​សរុប​ ៖ "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "ទំហំ​កំណែ​ភាព​អាស្រ័យ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "ទំហំ slack សរុប ៖"
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។"
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "រក​កញ្ចប់​មិន​ឃើញ"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិត​ប្រាកដ"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "ឯកសារ​កញ្ចប់ ៖"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "ឃ្លាំង​សម្ងាត់​ឋិតនៅ​ក្រៅ​ការ​ធ្វើ​សមកាល​កម្ម ដែលមិន​អាច x-ref ឯកសារ​កញ្ចប់​បាន​ទេ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ខ្ទាស់ ៖"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(រក​មិន​ឃើញ)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  បាន​ដំឡើង ៖ "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  សាកល្បង ៖ "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(គ្មាន)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  ខ្ទាស់​កញ្ចប់ ៖ "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  តារាង​កំណែ ៖"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -242,29 +243,29 @@ msgstr ""
 "  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
 "មើល​ apt-cache(8) និង​ apt.conf(5) សម្រាប់​ព័ត៌មាន​បន្ថែម​​មាន​ក្នុង​ទំព័រ​សៀវភៅដៃ​ ។\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "សូម​ផ្ដល់​ឈ្មោះ​ឲ្យ​ថាស​នេះ ឧទាហរណ៍​ដូចជា 'ដេបៀន 2.1r1 ថាស​ទី ១' ជាដើម"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "សូម​បញ្ចូល​ថាស​ក្នុង​ដ្រាយ​ហើយ​ចុច​បញ្ចូល​"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ធ្វើដំណើរការ​នេះ​ម្តង​ទៀត​ សម្រាប់​ស៊ីឌី​ទាំងអស់​​ក្នុង​សំណុំ​របស់​អ្នក ។"
 
@@ -300,65 +301,65 @@ msgstr ""
 "  -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ \n"
 "  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
@@ -378,114 +379,114 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, 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:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -494,37 +495,37 @@ msgstr ""
 "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
 "តម្រូវការ​កំណែបានឡើយ"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -609,53 +610,74 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -682,7 +704,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -730,173 +752,175 @@ msgstr "មិនអាចអាន់ម៉ោន ស៊ីឌី​-រ៉ូ�
 msgid "Disk not found."
 msgstr "រក​ថាសមិ​ន​ឃើញ​ ។"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "រកឯកសារ​មិន​ឃើញ​"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "បរាជ័យ​ក្នុងការថ្លែង"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI មិនត្រឹមត្រូវ​ URIS មូលដ្ឋានមិនត្រូវ​ចាប់ផ្តើម​ជាមួយ​ // ឡើយ"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "កំពុង​ចូល​"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "មិន​អាច​កំណត់ឈ្មោះដែលត្រូវបង្ហាញ​បានឡើយ​"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "មិន​អាច​កំណត់ឈ្មោះមូលដ្ឋាន​បានឡើយ"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "ម៉ាស៊ីន​បម្រើបានបដិសេធ​ការតភ្ជាប់ ហើយ​ បាននិយាយ ៖ %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER បរាជ័យ​ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS បានបរាជ័យ​ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "ម៉ាស៊ីន​បម្រើ​ប្រូកស៊ី​ត្រូវ​បាន​បញ្ជាក់​ ប៉ុន្តែ​គ្មាន​ស្គ្រីប​ចូល​ទេ Acquire::ftp::ProxyLogin គឺ ទទេ ។"
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "ពាក្យ​បញ្ជា​ស្គ្រីប​ចូល​ '%s' បានបរាជ័យ ម៉ាស៊ីន​បម្រើ​បាននិយាយ ៖ %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE បានបរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាននិយាយ​ ៖ %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "ការអាន​មានកំហុស"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន​​អស់ចំណុះ ។"
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "ការបង្ខូច​ពិធីការ​"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "ការសរសេរ​មានកំហុស"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើយ"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "បាន​បរាជ័យ"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "មិនអាចតភ្ជាប់​​រន្ធអកម្ម​​បានឡើយ ។"
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo មិន​អាច​​ទទួល​យក​រន្ធ​សម្រាប់​ស្តាប់​​បានឡើយ"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "មិន​អាច​ចងរន្ធ​បានបានឡើយ​"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "មិនអាច​ស្ដាប់នៅលើរន្ធ​បានឡើយ"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "មិន​អាច​កំណត់​ឈ្មោះរបស់​រន្ធ​បានឡើយ"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "មិនអាច​ផ្ញើពាក្យ​បញ្ជា​ PORT បានឡើយ"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "មិន​ស្គាល់​អាសយដ្ឋាន​គ្រួសារ​ %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT បរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ ៖ %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័បានអស់ពេល​"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "មិន​អាច​ទៅ​ប្រមូល​យក​ឯកសារ​បានឡើយ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "រន្ធ​ទិន្នន័យ​បាន​អស់​ពេល​"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "បរាជ័យក្នុងការ​ផ្ទេរ​ទិន្នន័យ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "សំណួរ​"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "មិន​អាច​ហៅ​ "
 
@@ -932,7 +956,7 @@ msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​ %s
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s"
@@ -962,182 +986,416 @@ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក
 msgid "Unable to connect to %s:%s:"
 msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "ហត្ថលេខា​ខាងក្រោម​មិន​អាចផ្ទៀងផ្ទាត់បាន​ទេ​ ព្រោះកូនសោ​សាធារណៈមិន​អាច​ប្រើ​បាន​ ៖\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "ជ្រើស​បាន​បរាជ័យ​"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "កំពុង​រង់ចាំ​បឋមកថា"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "ជួរ​បឋមកថា​ខូច​"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមកថាចម្លើយតបមិនត្រឹមត្រូវ"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកថាប្រវែង​​​មាតិកា​មិនត្រឹមត្រូវ​"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកថា​ជួរ​មាតិកា​មិន​ត្រឹមត្រូវ​"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូច​​​ជួរ​គាំទ្រ​"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "កំហុស​ខាង​ក្នុង​"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "ធ្វើរួច​"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " បាន​បរាជ័យ ។"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " ធ្វើ​រួច"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " ឬ"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (ដោយ​សារតែ​ %s) "
+
+#: apt-private/private-output.cc:662
+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"
+"ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu ​ត្រូវបានបន្ទាប់ "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex កំហុស​ការចងក្រង​ - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ចេញ​​ ប៉ុន្តែមិនអនុញ្ញាត​ឲ្យយកចេញឡើយ ។"
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr "យី អី​ក៏​ចម្លែង​ម្លេះ.. ទំហំ​មិន​ដូច​គ្នា​ឡើយ ។ សូម​ផ្ញើ​អ៊ីមែល​ទៅ apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "ត្រូវការ​​យក​ %sB/%sB នៃ​ប័ណ្ណសារ ។​\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "ត្រូវ​ការយក​ %sB នៃ​ប័ណ្ណសារ ។\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​ការ​បន្ថែម​​ទំហំ​ថាស​ត្រូវ​បាន​ប្រើ ។\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។"
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1148,20 +1406,20 @@ msgstr ""
 "ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "បោះបង់ ។"
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1169,19 +1427,19 @@ msgstr ""
 "អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --"
 "fix- ដែលបាត់ឬ់ ?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។"
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1191,15 +1449,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1215,16 +1473,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1234,7 +1492,7 @@ msgid_plural ""
 msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1242,24 +1500,24 @@ msgid_plural ""
 msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ 'apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1271,319 +1529,93 @@ msgstr ""
 "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n"
 " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។"
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 #, fuzzy
 msgid "Install these packages without verification?"
 msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? "
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " ឬ"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (ដោយ​សារតែ​ %s) "
-
-#: apt-private/private-output.cc:631
-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"
-"ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu ​ត្រូវបានបន្ទាប់ "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex កំហុស​ការចងក្រង​ - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " បាន​បរាជ័យ ។"
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " ធ្វើ​រួច"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "ធ្វើរួច​"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "វាយ​"
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "យក​ ៖"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "បាន​ទៅ​ប្រមូល​ %sB ក្នុង​ %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [កំពុង​ធ្វើការ​]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1596,19 +1628,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "មិន​អាច​អាន​ %s បានឡើយ"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ"
@@ -1637,11 +1669,11 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡ�
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល"
 
@@ -1681,1345 +1713,475 @@ msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន
 msgid "Merging available information"
 msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n"
-"ពី​កញ្ចប់​​ដេបៀន \n"
-"\n"
-"ជម្រើស ៖ ​\n"
-"  -h   អត្ថបទ​ជំនួយ​\n"
-"  -t  កំណត់​ថត​បណ្ដោះ​អាសន្ន\n"
-"  -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
-"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "មិន​អាច​សរសេរ​ទៅ %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "បញ្ជី​ផ្នែក​បន្ថែម​កញ្ចប់​វែង​ពេក"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "​កំហុស​ដំណើរការ​ថត​ %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "បញ្ជី​ផ្នែក​បន្ថែម​ប្រភព​វែង​ពេក"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "កំហុស​សរសេរ​បឋម​កថា​ទៅ​ឯកសារ​មាតិកា"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "កំហុស​ដំណើរការ​មាតិកា​ %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"ការប្រើប្រាស់ ៖ ពាក្យ​បញ្ជា​ apt-ftparchive [ជម្រើស] \n"
-"ពាក្យ​បញ្ជា​ ៖ កញ្ចប់ binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          ផ្លូវ​មាតិកា​\n"
-"          ផ្លូវ​ផ្សាយ​ចេញ \n"
-"          កំណត់​រចនាស្ព័ន្ធបង្កើត​ [groups]\n"
-"          ​​កំណត់​រចនាសម្ព័ន្ធសំអាត​​\n"
-"\n"
-"apt-ftparchive បង្កើត​​ឯកសារ​លិបិក្រម​សម្រាប់​ប័ណ្ណសារ​​ដេបៀន  ។ វា​គាំទ្រ​រចនាប័ទ្ម​នៃ​ការបង្កើតដោយ​"
-"ស្វ័យប្រវត្តិ​\n"
-"ដើម្បី​ធ្វើការ​ជំនួស​\n"
-" dpkg-scanpackages និង dpkg-scansources\n"
-"\n"
-"apt-ftparchive ដែល​បង្កើត​​​​ឯកសារ​ញ្ចប់​ ពី​មែកធាង​ .debs ។ ឯកសារ​កញ្ចប់មាន​\n"
-"​មាតិកា​នៃ វត្ថុបញ្ជា​​វាល​ទាំងអស់ ដែល​បាន​មក​ពី​កញ្ចប់​និមួយ​ៗដូចជា​ MD5 hash និង​ ទំហំ​ឯកសារ​ ។ ឯកសារ​"
-"បដិសេធ​​មិន​គាំទ្រ​ \n"
-"ដើម្បី​បង្ខំ​តម្លៃ​អាទិភាព​និង សម័យ​ ។\n"
-"\n"
-"ភាព​ដូច​គ្នា​នៃ​ apt-ftparchive បង្កើត​ឯកសារ​ប្រភព​ពី​មែកធាង​ .dscs ។\n"
-"ជម្រើស​បដិសេធ​ប្រភព​អាច​ត្រូវ​បាន​ប្រើ​សម្រាប់​បញ្ចាក់ឯកសារ​បដិសេធ src  \n"
-"\n"
-" បញ្ជា​'កញ្ចប់​' និង​ 'ប្រភព' ត្រូវ​​តែ​រត់​ជា​ root \n"
-" ។ BinaryPath ត្រូវ​ចង្អុល​​ទៅ​កាន់​មូលដ្ឋាន​ស្វែងរក​ហៅ​ខ្លួនឯង​ ហើយ​ \n"
-"ឯកសារ​បដិសេធ​ត្រូវមាន​ទង​បដិសេធ  ។  ផ្លូវ​បរិបទ​ត្រូវ​បាន​បន្ថែម​​ទៅ​ក្នុង​វាល​ឈ្មោះ​​ឯកសារ​បើ​វា​មាន​  ។ "
-"ឧទាហរណ៍​ ការប្រើប្រាស់​ពី​ប័ណ្ណសារ​ \n"
-"ដេបៀន  ៖\n"
-"   apt-ftparchive កញ្ចប់​dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"ជម្រើស​ ៖\n"
-"  -h    អត្ថបទ​ជំនួយ​នេះ​\n"
-"  --md5 Control MD5 ការបបង្កើត​\n"
-"  -s=?  ឯកសារ​បដិសេធ​ប្រភព​\n"
-"  -q    Quiet\n"
-"  -d=?  ជ្រើស​ជម្រើសលាក់​ទុ​ក​ទិន្នន័យ​\n"
-"  --គ្មាន​-delink អនុញ្ញាត​ delinking របៀប​បំបាត់​កំហុស​\n"
-"  --មាតិកា  ពិនិត្យ​ការបង្កើត​ឯកសារ​មាតិកា\n"
-"  -c=?  អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ​\n"
-"  -o=?  កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "ឯកសារ​មួយ​ចំនួន​បាត់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB បាន​ខូច​, ឯកសារ​បាន​ប្តូរ​ឈ្មោះ​ទៅ​ជា​ %s.old ។"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង"
-
-#: ftparchive/cachedb.cc:76
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​"
-"មូលដ្ឋាន​ទិន្នន័យ​ចេញ និង​បង្កើត​មូលដ្ឋាន​ទិន្នន័យ​ឡើង​វិញ ។"
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទេ %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង  %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W ៖ មិន​អាច​ថ្លែង %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​"
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "មែក​ធាង បាន​បរាជ័យ"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - បរាជ័យ​ក្នុង​ការ​​បម្រុង​​ទុក​សតិ​"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "មិន​អាចបើក​ %s បានឡើយ"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អានឯកសារ​បដិសេធ %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់​"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "បង្ហាប់កូន"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក្នុង​ការ​បង្កើត​ %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ នៅពេល​គណនា MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n"
-"ពី​កញ្ចប់​​ដេបៀន \n"
-"\n"
-"ជម្រើស ៖ ​\n"
-"  -h   អត្ថបទ​ជំនួយ​\n"
-"  -t  កំណត់​ថត​បណ្ដោះ​អាសន្ន\n"
-"  -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
-"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "មិន​ស្គាល់​កំណត់​ត្រា​កញ្ចប់ !"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"ការប្រើប្រាស់ ៖ apt-sortpkgs [ជម្រើស] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs ជា​ឧបករណ៍​ធម្មតា​ដើម្បី​តម្រៀប​ឯកសារ​កញ្ចប់ ។  ជម្រើស​ -s បាន​ប្រើ​\n"
-"សម្រាប់​ចង្អុល​ប្រភេទ​នៃ​​​ឯកសារ​អ្វីមួយដែល​មាន​ ។\n"
-"\n"
-"ជម្រើស​\n"
-"  -h   អត្ថបទ​ជំនួយ​នេះ​\n"
-"  -s   ប្រើ​ការ​តម្រៀប​ឯកសារ​ប្រភព\n"
-"  -c=? អាន​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធនេះ​\n"
-"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "ប័ណ្ណសារ​បាន​ខូច​"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណសារ​បាន​ខូច"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR  %u ដែលជា​សមាជិក​ %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "ហត្ថលេខា​ប័ណ្ណសា​រមិន​ត្រឹមត្រូវ​"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "កំហុស​ក្នុងការ​អានបឋមកថា​សមាជិក​ប័ណ្ណសារ"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "ប័ណ្ណសារ ខ្លីពេក"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "បរាជ័យ​ក្នុងការ​អាន​បឋមកថា​ប័ណ្ណសារ"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "ទម្លាក់​ថ្នាំង​ដែល​បាន​ហៅ​លើ​ថ្នាំងដែល​នៅតែតភ្ជាប់"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "បរាជ័យ​ក្នុងការ​ដាក់ទីតាំង​ធាតុ​ដែលរាយប៉ាយ !"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "បរាជ័យ​ក្នុងការ​បម្រុងទុក​ការបង្វែរ"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "កំហុស​ខាងក្នុង នៅក្នុង AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "កំពុង​ព្យាយាម​សរសេរ​ជាន់​ពីលើ​ការបង្វែរ %s -> %s និង​ %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "ការបន្ថែម​ស្ទួន នៃការបង្វែរ​ %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ស្ទួន​ %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "ផ្លូវ​ %s វែង​ពេក"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "កំពុង​ពន្លា​ %s ច្រើន​ជាង​ម្តង​"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "ថត​ %s ត្រូវបាន​បង្វែរ"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "កញ្ចប់ ​កំពុង​ព្យាយាម​សរសេរ​ទៅកាន់​គោលដៅ​បង្វែរ​ %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "ផ្លូវ​បង្វែរ វែងពេក"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង  %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "ថត​ %s ត្រូវ​បាន​ជំនួស​ដោយ​មិនមែន​ជា​ថត​"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "បរាជ័យ​ក្នុងការ​ដាក់ថ្នាំង​នៅក្នុង​ធុង​រាយប៉ាយ​របស់វា"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "ផ្លូវ​វែង​ពេក"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "សរសេរ​ជាន់​លើកញ្ចប់ផ្គួផ្គង​ដោយ​គ្មាន​កំណែ​សម្រាប់ %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​មួយ​ក្នុង​កញ្ចប់ %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "មិន​អាច​ថ្លែង %s បានឡើយ"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "នេះ​ជាមិនមែនជា​ប័ណ្ណសារ​ DEB ​ត្រឹមត្រូវទេ បាត់បង់សមាជិក​ '%s'​"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "កំហុស​ខាងក្នុង ​មិន​អាច​កំណត់​ទីតាំង​សមាជិក​ %s បានឡើយ"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "ឯកសារត្រួតពិនិត្យ​ដែលមិនអាច​ញែកបាន"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "ហត្ថលេខា​ប័ណ្ណសា​រមិន​ត្រឹមត្រូវ​"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "កំហុស​ក្នុងការ​អានបឋមកថា​សមាជិក​ប័ណ្ណសារ"
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
+msgid "Invalid archive member header %s"
+msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "មិន​អាចបើក​ %s បានឡើយ"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "មិន​អាច​ហៅ​ "
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "ប័ណ្ណសារ ខ្លីពេក"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "បរាជ័យ​ក្នុងការ​អាន​បឋមកថា​ប័ណ្ណសារ"
 
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip"
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "ប័ណ្ណសារ​បាន​ខូច​"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណសារ​បាន​ខូច"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR  %u ដែលជា​សមាជិក​ %s"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។"
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%limin %lis"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Selection %s not found"
-msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រភេទ​អក្សរ​សង្ខេប ៖ '%c'"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ប្លុក​ចាប់​ផ្តើម​​ដោយ​គ្មាន​ឈ្មោះ​ ។"
-
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ស្លាក​ដែលបាន Malformed"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ តម្លៃ​ឥតបានការ​នៅ​ក្រៅ​"
-
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ"
+msgid "Packaging system '%s' is not supported"
+msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ មាន​ការរួមបញ្ចូល​ដែលដាក់​រួមគ្នា​យ៉ាងច្រើន"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ បានរួម​បញ្ចូល​ពី​ទីនេះ​"
+msgid "Wrote %i records.\n"
+msgstr "បានសរសេរ %i កំណត់ត្រា ។\n"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដី​បង្គាប់​ដែល​មិនបានគាំទ្រ '%s'"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥតបានការ​បន្ថែម ដែលនៅខាងចុង​ឯកសារ"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... កំហុស ​!"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... ធ្វើរួច​"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... ធ្វើរួច​"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "ជម្រើស​បន្ទាត់​ពាក្យបញ្ជា '%c' [from %s] មិនស្គាល់ឡើយ ។"
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "មិនយល់​ពី​ជម្រើស​បន្ទាត់​ពាក្យ​បញ្ជា %s ឡើយ"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "ជម្រើស​បន្ទាត់ពាក្យ​បញ្ជា​ %s មិនមែនជាប៊ូលីនទេ"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "ជម្រើស​ %s ត្រូវការ​អាគុយម៉ង់មួយ ។"
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "ជម្រើស %s ៖ ការបញ្ជាក់​ធាតុ​កំណត់រចនាសម្ព័ន្ធត្រូវតែមាន =<val> មួយ ។"
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "ជម្រើស​ %s ត្រូវ​ការ​អាគុយម៉ង់​ចំនួន​គត់​ មិន​មែន​ '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "ជម្រើស​ '%s' វែងពេក"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "មិនបានយល់អំពី​ការស្គាល់​ %s ឡើយ សូមព្យាយមយក​ ពិត​ ​​​ឫ មិន​ពិត ។"
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "មិនអាច​ថ្លែង ចំណុចម៉ោន %s បានឡើយ"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម"
-
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgid "Hash mismatch for: %s"
+msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
+msgid "The method driver %s could not be found."
+msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)"
+msgid "Is the package %s installed?"
+msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ "
+msgid "Method %s did not start correctly"
+msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Could not open file %s"
-msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។"
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "ឯកសារ​ឃ្លាំងសម្ងាត់​​កញ្ចប់​ជាកំណែ​មិន​ត្រូវគ្នា​"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​ ការធ្វើកំណែនេះទេ​ '%s'"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា​​"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "អាស្រ័យ​"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "អាស្រ័យជា​មុន"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "ផ្ដល់យោបល់​"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "ផ្តល់​អនុសាសន៍​"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "ប៉ះទង្គិច"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "ជំនួស​"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "លែង​ប្រើ"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "សំខាន់​"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "បាន​ទាមទារ"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "គំរូ"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "ស្រេចចិត្ត"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "បន្ថែម"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "កំណែ​សាកល្បង​"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-#, fuzzy
-msgid "Reading state information"
-msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
-
-#: apt-pkg/depcache.cc:244
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "បន្ទាត់​ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "បន្ទាត់ Malformed  %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "បន្ទាត់​ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "កំពុង​បើក​ %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "បន្ទាត់​ Malformed  %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
-
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"ការរត់​ការដំឡើង​នេះ នឹងទាមទារ​ឲ្យយកកញ្ចប់ចាំបាច់ %s បណ្ដោះអាសន្ន ដោយសារ រង្វិល ការប៉ះទង្គិច/"
-"ភាពអាស្រ័យជាមុន ។ ជាញឹកញាប់គឺ មិនត្រឹមត្រូវ ប៉ុន្តែ ប្រសិនបើអ្នក​ពិតជាចង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::"
-"Force-LoopBreak សកម្ម ។"
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។"
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​"
-"ដែលបាន​ទុក ។"
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។"
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "ថត​ប័ណ្ណសារ​ %spartial គឺ​បាត់បង់​ ។"
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។"
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។"
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។"
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្ជុល %s ឡើយ"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​  APT នេះ​ឆបគ្នា​​  ។"
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "មិន​អាច​សរសេរ​ទៅ %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។"
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3027,12 +2189,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3041,105 +2203,164 @@ msgstr ""
 "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
 "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្តិត​ម្រាម​ដៃ"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
+msgid "List directory %spartial is missing."
+msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
+msgid "Archives directory %spartial is missing."
+msgstr "ថត​ប័ណ្ណសារ​ %spartial គឺ​បាត់បង់​ ។"
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)"
+
+#: apt-pkg/acquire.cc:901
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។"
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្ជុល %s ឡើយ"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
+msgid "Could not configure '%s'. "
+msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្តិត​ម្រាម​ដៃ"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"ការរត់​ការដំឡើង​នេះ នឹងទាមទារ​ឲ្យយកកញ្ចប់ចាំបាច់ %s បណ្ដោះអាសន្ន ដោយសារ រង្វិល ការប៉ះទង្គិច/"
+"ភាពអាស្រ័យជាមុន ។ ជាញឹកញាប់គឺ មិនត្រឹមត្រូវ ប៉ុន្តែ ប្រសិនបើអ្នក​ពិតជាចង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::"
+"Force-LoopBreak សកម្ម ។"
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
+
+#: apt-pkg/cdrom.cc:571
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..."
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "ប្រើប្រាស់ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "ការមិនម៉ោន​ ស៊ីឌី-រ៉ូម​\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "កំពុង​រង់ចាំឌីស​...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "កំពុង​ម៉ោន​ ស៊ីឌី​-រ៉ូម​...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "បានទុក​ស្លាក ៖ %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..."
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "កំពុង​ស្កេន​ឌីស​សម្រាប់​​ឯកសារ​លិបិក្រម​...\n"
 
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "កំពុង​ស្កេន​ឌីស​សម្រាប់​​ឯកសារ​លិបិក្រម​..\n"
-
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i  លិបិក្រម​ប្រភព%i  និង ហត្ថលេខា %i \n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "បានទុក​ស្លាក ៖ %s \n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "នោះមិនមែនជាឈ្មោះត្រឹមត្រូវទេ សូមព្យាយាម​ម្ដងទៀត ។\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3148,301 +2369,1113 @@ msgstr ""
 "ឌីស​នេះ​ត្រូវ​បាន​ហៅ​ ៖ \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "កំពុង​ចម្លង​បញ្ជី​កញ្ចប់..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ្មី\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "បានសរសេរ %i កំណត់ត្រា ។\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​"
+"ដែលបាន​ទុក ។"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "កំណែ​សាកល្បង​"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
+
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "MD5Sum មិន​ផ្គួផ្គង​"
+msgid "Failed to open StateFile %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
+
+#: apt-pkg/tagfile.cc:140
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
+
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
+
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "បន្ទាត់​ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "បន្ទាត់​ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "កំពុង​បើក​ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "បន្ទាត់​ Malformed  %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "បាន​ដំឡើង %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "កំពុង​យក %s ចេញ"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "កំពុងរៀបចំ​ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "កំពុង​ស្រាយ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "បាន​ដំឡើង %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "បាន​យក %s ចេញ"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "មិន​អាច​សរសេរ​ទៅ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ "
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... កំហុស ​!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... ធ្វើរួច​"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... ធ្វើរួច​"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "មិន​អាចបើក​ %s បានឡើយ"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "មិន​អាច​ហៅ​ "
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
+
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "មិនអាច​ថ្លែង ចំណុចម៉ោន %s បានឡើយ"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រភេទ​អក្សរ​សង្ខេប ៖ '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ប្លុក​ចាប់​ផ្តើម​​ដោយ​គ្មាន​ឈ្មោះ​ ។"
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ស្លាក​ដែលបាន Malformed"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ តម្លៃ​ឥតបានការ​នៅ​ក្រៅ​"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ មាន​ការរួមបញ្ចូល​ដែលដាក់​រួមគ្នា​យ៉ាងច្រើន"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ បានរួម​បញ្ចូល​ពី​ទីនេះ​"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដី​បង្គាប់​ដែល​មិនបានគាំទ្រ '%s'"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥតបានការ​បន្ថែម ដែលនៅខាងចុង​ឯកសារ"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "ជម្រើស​បន្ទាត់​ពាក្យបញ្ជា '%c' [from %s] មិនស្គាល់ឡើយ ។"
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "មិនយល់​ពី​ជម្រើស​បន្ទាត់​ពាក្យ​បញ្ជា %s ឡើយ"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "ជម្រើស​បន្ទាត់ពាក្យ​បញ្ជា​ %s មិនមែនជាប៊ូលីនទេ"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "ជម្រើស​ %s ត្រូវការ​អាគុយម៉ង់មួយ ។"
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "ជម្រើស %s ៖ ការបញ្ជាក់​ធាតុ​កំណត់រចនាសម្ព័ន្ធត្រូវតែមាន =<val> មួយ ។"
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "ជម្រើស​ %s ត្រូវ​ការ​អាគុយម៉ង់​ចំនួន​គត់​ មិន​មែន​ '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "ជម្រើស​ '%s' វែងពេក"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "មិនបានយល់អំពី​ការស្គាល់​ %s ឡើយ សូមព្យាយមយក​ ពិត​ ​​​ឫ មិន​ពិត ។"
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n"
+"ពី​កញ្ចប់​​ដេបៀន \n"
+"\n"
+"ជម្រើស ៖ ​\n"
+"  -h   អត្ថបទ​ជំនួយ​\n"
+"  -t  កំណត់​ថត​បណ្ដោះ​អាសន្ន\n"
+"  -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
+"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "មិន​អាច​ថ្លែង %s បានឡើយ"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "បញ្ជី​ផ្នែក​បន្ថែម​កញ្ចប់​វែង​ពេក"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "​កំហុស​ដំណើរការ​ថត​ %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "បញ្ជី​ផ្នែក​បន្ថែម​ប្រភព​វែង​ពេក"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "កំហុស​សរសេរ​បឋម​កថា​ទៅ​ឯកសារ​មាតិកា"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "កំហុស​ដំណើរការ​មាតិកា​ %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"ការប្រើប្រាស់ ៖ ពាក្យ​បញ្ជា​ apt-ftparchive [ជម្រើស] \n"
+"ពាក្យ​បញ្ជា​ ៖ កញ្ចប់ binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          ផ្លូវ​មាតិកា​\n"
+"          ផ្លូវ​ផ្សាយ​ចេញ \n"
+"          កំណត់​រចនាស្ព័ន្ធបង្កើត​ [groups]\n"
+"          ​​កំណត់​រចនាសម្ព័ន្ធសំអាត​​\n"
+"\n"
+"apt-ftparchive បង្កើត​​ឯកសារ​លិបិក្រម​សម្រាប់​ប័ណ្ណសារ​​ដេបៀន  ។ វា​គាំទ្រ​រចនាប័ទ្ម​នៃ​ការបង្កើតដោយ​"
+"ស្វ័យប្រវត្តិ​\n"
+"ដើម្បី​ធ្វើការ​ជំនួស​\n"
+" dpkg-scanpackages និង dpkg-scansources\n"
+"\n"
+"apt-ftparchive ដែល​បង្កើត​​​​ឯកសារ​ញ្ចប់​ ពី​មែកធាង​ .debs ។ ឯកសារ​កញ្ចប់មាន​\n"
+"​មាតិកា​នៃ វត្ថុបញ្ជា​​វាល​ទាំងអស់ ដែល​បាន​មក​ពី​កញ្ចប់​និមួយ​ៗដូចជា​ MD5 hash និង​ ទំហំ​ឯកសារ​ ។ ឯកសារ​"
+"បដិសេធ​​មិន​គាំទ្រ​ \n"
+"ដើម្បី​បង្ខំ​តម្លៃ​អាទិភាព​និង សម័យ​ ។\n"
+"\n"
+"ភាព​ដូច​គ្នា​នៃ​ apt-ftparchive បង្កើត​ឯកសារ​ប្រភព​ពី​មែកធាង​ .dscs ។\n"
+"ជម្រើស​បដិសេធ​ប្រភព​អាច​ត្រូវ​បាន​ប្រើ​សម្រាប់​បញ្ចាក់ឯកសារ​បដិសេធ src  \n"
+"\n"
+" បញ្ជា​'កញ្ចប់​' និង​ 'ប្រភព' ត្រូវ​​តែ​រត់​ជា​ root \n"
+" ។ BinaryPath ត្រូវ​ចង្អុល​​ទៅ​កាន់​មូលដ្ឋាន​ស្វែងរក​ហៅ​ខ្លួនឯង​ ហើយ​ \n"
+"ឯកសារ​បដិសេធ​ត្រូវមាន​ទង​បដិសេធ  ។  ផ្លូវ​បរិបទ​ត្រូវ​បាន​បន្ថែម​​ទៅ​ក្នុង​វាល​ឈ្មោះ​​ឯកសារ​បើ​វា​មាន​  ។ "
+"ឧទាហរណ៍​ ការប្រើប្រាស់​ពី​ប័ណ្ណសារ​ \n"
+"ដេបៀន  ៖\n"
+"   apt-ftparchive កញ្ចប់​dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"ជម្រើស​ ៖\n"
+"  -h    អត្ថបទ​ជំនួយ​នេះ​\n"
+"  --md5 Control MD5 ការបបង្កើត​\n"
+"  -s=?  ឯកសារ​បដិសេធ​ប្រភព​\n"
+"  -q    Quiet\n"
+"  -d=?  ជ្រើស​ជម្រើសលាក់​ទុ​ក​ទិន្នន័យ​\n"
+"  --គ្មាន​-delink អនុញ្ញាត​ delinking របៀប​បំបាត់​កំហុស​\n"
+"  --មាតិកា  ពិនិត្យ​ការបង្កើត​ឯកសារ​មាតិកា\n"
+"  -c=?  អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ​\n"
+"  -o=?  កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "ឯកសារ​មួយ​ចំនួន​បាត់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB បាន​ខូច​, ឯកសារ​បាន​ប្តូរ​ឈ្មោះ​ទៅ​ជា​ %s.old ។"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង"
+
+#: ftparchive/cachedb.cc:80
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​"
+"មូលដ្ឋាន​ទិន្នន័យ​ចេញ និង​បង្កើត​មូលដ្ឋាន​ទិន្នន័យ​ឡើង​វិញ ។"
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទេ %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W ៖ មិន​អាច​ថ្លែង %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​"
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "មែក​ធាង បាន​បរាជ័យ"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - បរាជ័យ​ក្នុង​ការ​​បម្រុង​​ទុក​សតិ​"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "មិន​អាចបើក​ %s បានឡើយ"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អានឯកសារ​បដិសេធ %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់​"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "បង្ហាប់កូន"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក្នុង​ការ​បង្កើត​ %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ នៅពេល​គណនា MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n"
+"ពី​កញ្ចប់​​ដេបៀន \n"
+"\n"
+"ជម្រើស ៖ ​\n"
+"  -h   អត្ថបទ​ជំនួយ​\n"
+"  -t  កំណត់​ថត​បណ្ដោះ​អាសន្ន\n"
+"  -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
+"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "មិន​ស្គាល់​កំណត់​ត្រា​កញ្ចប់ !"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ការប្រើប្រាស់ ៖ apt-sortpkgs [ជម្រើស] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs ជា​ឧបករណ៍​ធម្មតា​ដើម្បី​តម្រៀប​ឯកសារ​កញ្ចប់ ។  ជម្រើស​ -s បាន​ប្រើ​\n"
+"សម្រាប់​ចង្អុល​ប្រភេទ​នៃ​​​ឯកសារ​អ្វីមួយដែល​មាន​ ។\n"
+"\n"
+"ជម្រើស​\n"
+"  -h   អត្ថបទ​ជំនួយ​នេះ​\n"
+"  -s   ប្រើ​ការ​តម្រៀប​ឯកសារ​ប្រភព\n"
+"  -c=? អាន​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធនេះ​\n"
+"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s មិនមែន​ជា​កញ្ចប់​ DEB ត្រឹមត្រូវ​ទេ​ ។"
 
diff --git a/po/ko.po b/po/ko.po
index dd6b90dd6..2510aa592 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2010-08-30 02:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -15,152 +15,153 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "%s 패키지의 %s 버전의 의존성이 맞지 않습니다:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "전체 패키지 이름 : "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "전체 패키지 구조: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  일반 패키지: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  순수 가상 패키지: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  단일 가상 패키지: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  혼합 가상 패키지: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  빠짐: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "개별 버전 전체: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "개별 설명 전체: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "전체 의존성: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "전체 버전/파일 관계: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "전체 설명/파일 관계: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "전체 제공 매핑: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "전체 패턴 문자열: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "전체 의존성 버전 용량: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "전체 빈 용량: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "차지하는 전체 용량: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "패키지가 없습니다"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "최소 한 개의 검색어를 지정해야 합니다"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%s 패키지를 찾을 수 없습니다"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "패키지 파일:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "캐시가 동기화되지 않았습니다. 패키지 파일을 상호 참조할 수 없습니다"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "핀 패키지:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(없음)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  설치: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  후보: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(없음)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  패키지 핀: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  버전 테이블:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s(%s), 컴파일 시각 %s %s\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -234,28 +235,28 @@ msgstr ""
 "  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 "좀 더 자세한 정보는 apt-cache(8) 및 apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "이 디스크의 이름을 정하십시오 (예: 'Debian 5.0.3 Disk 1')"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "드라이브에 디스크를 넣고 Enter를 누르십시오"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "현재 갖고 있는 다른 CD에도 이 과정을 반복하십시오."
 
@@ -291,65 +292,65 @@ msgstr ""
 "  -c=? 해당 설정 파일을 읽습니다\n"
 "  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "소스 패키지로 '%s'을(를) '%s' 대신 선택합니다\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "'%2$s' 패키지의 '%1$s' 버전은 없으므로 무시합니다."
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s 패키지를 찾을 수 없습니다"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 패키지 수동설치로 지정합니다.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s 패키지는 수동설치로 지정합니다.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "다운로드 디렉터리를 잠글 수 없습니다"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s의 소스 패키지를 찾을 수 없습니다"
@@ -374,95 +375,95 @@ msgstr ""
 "다음과 같이 하십시오:\n"
 "bzr get %s\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s에 충분한 공간이 없습니다"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s 소스를 가져옵니다\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "일부 아카이브를 가져오는데 실패했습니다."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "압축 풀기 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "빌드 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "하위 프로세스가 실패했습니다"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -471,7 +472,7 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -480,14 +481,14 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -496,7 +497,7 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
 "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -505,30 +506,30 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "빌드 의존성을 처리하는데 실패했습니다"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s(%s)에 연결하는 중입니다"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "지원하는 모듈:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -616,53 +617,74 @@ msgstr ""
 "apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
 "                       이 APT는 Super Cow Powers로 무장했습니다.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "하지만 설치하지 않았습니다"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s 패키지 수동설치로 지정합니다.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s 패키지는 수동설치로 지정합니다.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s 패키지 수동설치로 지정합니다.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s 파일을 여는데 실패했습니다"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -689,7 +711,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -737,52 +759,52 @@ msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일
 msgid "Disk not found."
 msgstr "디스크가 없습니다."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "파일이 없습니다"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "파일 정보를 읽는데 실패했습니다"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "파일 변경 시각을 설정하는데 실패했습니다"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI가 틀렸습니다. 로컬 URI는 //로 시작해야 합니다."
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "로그인하는 중입니다"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "상대방의 이름을 알 수 없습니다"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "로컬 이름을 알 수 없습니다"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "서버에서 다음과 같이 연결을 거부했습니다: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -790,121 +812,123 @@ msgstr ""
 "프록시 서버를 지정했지만 로그인 스크립트가 없습니다. Acquire::ftp::"
 "ProxyLogin 값이 비어 있습니다."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "로그인 스크립트 명령 '%s' 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "연결 시간 초과"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "서버에서 연결을 닫았습니다"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "읽기 오류"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "응답이 버퍼 크기를 넘어갔습니다."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "프로토콜이 틀렸습니다"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "쓰기 오류"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "소켓을 만들 수 없습니다"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "실패"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "수동(passive) 소켓을 연결할 수 없습니다."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo에서 소켓에 listen할 수 없습니다"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "소켓을 bind할 수 없습니다"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "소켓에 listen할 수 없습니다"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "소켓의 이름을 알아낼 수 없습니다"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "PORT 명령을 보낼 수 없습니다"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "주소 %u의 종류(AF_*)를 알 수 없습니다"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "데이터 소켓 연결 시간 초과"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "연결을 받을 수 없습니다"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "파일 해싱에 문제가 있습니다"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "파일을 가져올 수 없습니다. 서버 왈, '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "데이터 소켓에 제한 시간이 초과했습니다"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "데이터 전송 실패, 서버에서는: %s"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "질의"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "다음을 실행할 수 없습니다: "
 
@@ -940,7 +964,7 @@ msgstr "%s:%s에 연결할 수 없습니다 (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s에 연결하는 중입니다"
@@ -970,174 +994,407 @@ msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생�
 msgid "Unable to connect to %s:%s:"
 msgstr "%s:%s에 연결할 수 없습니다:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "다음 서명이 올바르지 않습니다:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "해당 파일에 쓰는데 오류가 발생했습니다"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "서버에서 읽는데 오류가 발생했습니다"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "파일에 쓰는데 오류가 발생했습니다"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "select가 실패했습니다"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "연결 시간이 초과했습니다"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "출력 파일에 쓰는데 오류가 발생했습니다"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "헤더를 기다리는 중입니다"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "헤더 줄이 잘못되었습니다"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "데이터 형식을 알 수 없습니다"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "헤더 데이터가 잘못되었습니다"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "내부 오류"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "업그레이드를 계산하는 중입니다... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "완료"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "의존성을 바로잡는 중입니다..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 실패."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "의존성을 바로잡을 수 없습니다"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "업그레이드 집합을 최소화할 수 없습니다"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 완료"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "다음 패키지의 의존성이 맞지 않습니다:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "하지만 %s 패키지를 설치했습니다"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "하지만 %s 패키지를 설치할 것입니다"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "하지만 설치할 수 없습니다"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "하지만 가상 패키지입니다"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "하지만 설치하지 않았습니다"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " 혹은"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "다음 새 패키지를 설치할 것입니다:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "다음 패키지를 지울 것입니다:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "다음 패키지를 과거 버전으로 유지합니다:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "다음 패키지를 업그레이드할 것입니다:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "다음 패키지를 다운그레이드할 것입니다:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s때문에) "
+
+#: apt-private/private-output.cc:662
+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"
+"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu개 업그레이드, %lu개 새로 설치, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu개 다시 설치, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu개 업그레이드, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "정규식 컴파일 오류 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update 명령은 인수를 받지 않습니다"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "패키지를 제거해야 하지만 제거가 금지되어 있습니다."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십"
 "시오."
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%s바이트 아카이브를 받아야 합니다.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s 안에 충분한 여유 공간이 없습니다."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 "
@@ -1146,11 +1403,11 @@ msgstr ""
 # 입력을 받아야 한다.  한글 입력을 못 할 수 있으므로 원문 그대로 사용.
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1161,19 +1418,19 @@ msgstr ""
 "계속하시려면 다음 문구를 입력하십시오: '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "중단."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "계속 하시겠습니까?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "일부 파일을 받는데 실패했습니다"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1181,19 +1438,19 @@ msgstr ""
 "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-"
 "missing 옵션을 줘서 실행해야 할 것입니다."
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "빠진 패키지를 바로잡을 수 없습니다."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "설치를 중단합니다."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1204,15 +1461,15 @@ msgstr[0] ""
 "다음 패키지는 패키지의 파일을 모두 다른 패키지가\n"
 "덮어썼기 때문에 사라졌습니다:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1230,15 +1487,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "이 상황을 해결하는데 다음 정보가 도움이 될 수도 있습니다:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1246,25 +1503,25 @@ msgid_plural ""
 "required:"
 msgstr[0] "다음 패키지가 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
 msgstr[0] "패키지 %lu개가 자동으로 설치되었지만 더 이상 필요하지 않습니다.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "이들을 지우려면 'apt-get autoremove'를 사용하십시오."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "다음을 바로잡으려면 'apt-get -f install'을 실행해 보십시오:"
 
 # FIXME: specify a solution?  무슨 솔루션?
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1272,7 +1529,7 @@ msgstr ""
 "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 "
 "(아니면 해결 방법을 지정하십시오)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1283,322 +1540,96 @@ msgstr ""
 "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n"
 "아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "망가진 패키지"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "다음 패키지를 더 설치할 것입니다:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "제안하는 패키지:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "추천하는 패키지:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"알림: 시험 동작입니다!\n"
+"      실행하려면 apt-get을 실행할 때 루트 권한이 필요합니다.\n"
+"      또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n"
+"      않도록 하십시오!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "경고: 다음 패키지를 인증할 수 없습니다!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "인증 경고를 무시합니다.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "인증할 수 없는 패키지가 있습니다"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "확인하지 않고 패키지를 설치하시겠습니까?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s 파일을 받는데 실패했습니다  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "다음 패키지의 의존성이 맞지 않습니다:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "하지만 %s 패키지를 설치했습니다"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "하지만 %s 패키지를 설치할 것입니다"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "하지만 설치할 수 없습니다"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "하지만 가상 패키지입니다"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "하지만 설치하지 않았습니다"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " 혹은"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "다음 새 패키지를 설치할 것입니다:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "다음 패키지를 지울 것입니다:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "다음 패키지를 과거 버전으로 유지합니다:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "다음 패키지를 업그레이드할 것입니다:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "다음 패키지를 다운그레이드할 것입니다:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s때문에) "
-
-#: apt-private/private-output.cc:631
-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"
-"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu개 업그레이드, %lu개 새로 설치, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu개 다시 설치, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu개 업그레이드, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "정규식 컴파일 오류 - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "의존성을 바로잡는 중입니다..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " 실패."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "의존성을 바로잡을 수 없습니다"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "업그레이드 집합을 최소화할 수 없습니다"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " 완료"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "update 명령은 인수를 받지 않습니다"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "업그레이드를 계산하는 중입니다... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "완료"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"알림: 시험 동작입니다!\n"
-"      실행하려면 apt-get을 실행할 때 루트 권한이 필요합니다.\n"
-"      또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n"
-"      않도록 하십시오!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "기존 "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "받기:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "무시"
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "오류 "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "내려받기 %s바이트, 소요시간 %s (%s바이트/초)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [작업중]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1611,19 +1642,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s을(를) 읽을 수 없습니다"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s 디렉토리로 이동할 수 없습니다"
@@ -1652,11 +1683,11 @@ msgstr "'%s' 미러 파일이 없습니다 "
 msgid "[Mirror: %s]"
 msgstr "[미러 사이트: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "연결이 너무 빨리 끊어졌습니다"
 
@@ -1695,1349 +1726,474 @@ msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를 �
 msgid "Merging available information"
 msgstr "이용 가능 패키지 정보를 합칩니다"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"사용법: apt-extracttemplates 파일1 [파일2 ...]\n"
-"\n"
-"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n"
-"도구입니다\n"
-"\n"
-"옵션:\n"
-"  -h   이 도움말\n"
-"  -t   임시 디렉토리 설정\n"
-"  -c=? 설정 파일을 읽습니다\n"
-"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s에 쓸 수 없습니다"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "패키지 확장 목록이 너무 깁니다"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "%s 디렉터리를 처리하는데 오류가 발생했습니다"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "소스 확장 목록이 너무 깁니다"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"사용법: apt-ftparchive [옵션] 명령\n"
-"명령: packages 바이너리경로 [override파일 [경로앞부분]]\n"
-"      sources 소스경로 [override파일 [경로앞부분]]\n"
-"      contents 경로\n"
-"      release 경로\n"
-"      generate 설정 [그룹]\n"
-"      clean 설정\n"
-"\n"
-"apt-ftparchive는 데비안 아카이브용 인덱스 파일을 만듭니다. 이 프로그램은\n"
-"여러 종류의 인덱스 파일 만드는 작업을 지원합니다 -- 완전 자동화 작업부터\n"
-"dpkg-scanpackages와 dpkg-scansources의 기능을 대체하기도 합니다.\n"
-"\n"
-"apt-ftparchive는 .deb 파일의 트리에서부터 Package 파일을 만듭니다.\n"
-"Package 파일에는 각 패키지의 모든 제어 필드는 물론 MD5 해시와 파일\n"
-"크기도 들어 있습니다. override 파일을 이용해 Priority와 Section의 값을 \n"
-"강제로 설정할 수 있습니다\n"
-"\n"
-"이와 비슷하게 apt-ftparchive는 .dsc 파일의 트리에서 Sources 파일을\n"
-"만듭니다. --source-override 옵션을 이용해 소스 override 파일을\n"
-"지정할 수 있습니다.\n"
-"\n"
-"'packages'와 'sources' 명령은 해당 트리의 맨 위에서 실행해야 합니다.\n"
-"\"바이너리경로\"는 검색할 때의 기준 위치를 가리키며 \"override파일\"에는\n"
-"override 플래그들을 담고 있습니다. \"경로앞부분\"은 각 파일 이름\n"
-"필드의 앞에 더해 집니다. 데비안 아카이브에 있는 예를 하나 들자면:\n"
-"\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"옵션:\n"
-"  -h    이 도움말\n"
-"  --md5 MD5 만들기 작업을 제어합니다\n"
-"  -s=?  소스 override 파일\n"
-"  -q    조용히\n"
-"  -d=?  캐시 데이터베이스를 직접 설정합니다\n"
-"  --no-delink 디버깅 모드 지우기를 사용합니다\n"
-"  --contents  컨텐츠 파일을 만드는 적업을 제어합니다\n"
-"  -c=?  이 설정 파일을 읽습니다\n"
-"  -o=?  임의의 옵션을 설정합니다"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "맞는 패키지가 없습니다"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "`%s' 패키지 파일 그룹에 몇몇 파일이 빠졌습니다"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB 형식이 잘못되었습니다. APT 예전 버전에서 업그레이드했다면, 데이터베이스를 "
-"지우고 다시 만드십시오."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "DB 파일, %s 파일을 열 수 없습니다: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%s의 정보를 읽는데 실패했습니다"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "아카이브에 컨트롤 기록이 없습니다"
-
-# FIXME: 왠 커서??
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "커서를 가져올 수 없습니다"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "경고: %s의 정보를 읽을 수 없습니다\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "오류: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "경고: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s의 경로를 알아내는데 실패했습니다"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "트리에서 이동이 실패했습니다"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s 파일을 여는데 실패했습니다"
-
-# FIXME: ??
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " 링크 %s [%s] 없애기\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "%s 파일에 readlink하는데 실패했습니다"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "%s 파일을 지우는데 실패했습니다"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "아카이브에 패키지 필드가 없습니다"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s에는 override 항목이 없습니다\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 관리자가 %s입니다 (%s 아님)\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s에는 source override 항목이 없습니다\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s에는 binary override 항목이 없습니다\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 메모리를 할당하는데 실패했습니다"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s 열 수 없습니다"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "%s override 파일을 읽는데 실패했습니다"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' 압축 알고리즘을 알 수 없습니다"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "FILE*를 만드는데 실패했습니다"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "fork하는데 실패했습니다"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "압축 하위 프로세스"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "내부 오류, %s 만드는데 실패했습니다"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "MD5를 계산하는 동안 읽는데 실패했습니다"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "%s의 링크를 해제하는데 문제가 있습니다"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"사용법: apt-extracttemplates 파일1 [파일2 ...]\n"
-"\n"
-"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n"
-"도구입니다\n"
-"\n"
-"옵션:\n"
-"  -h   이 도움말\n"
-"  -t   임시 디렉토리 설정\n"
-"  -c=? 설정 파일을 읽습니다\n"
-"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "알 수 없는 패키지 기록!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"사용법: apt-sortpkgs [옵션] 파일1 [파일2 ...]\n"
-"\n"
-"apt-sortpkgs는 패키지 파일을 정렬하는 간단한 도구입니다. -s 옵션은 무슨 파일"
-"인지\n"
-"알아 내는데 쓰입니다.\n"
-"\n"
-"옵션:\n"
-"  -h   이 도움말\n"
-"  -s   소스 파일 정렬을 사용합니다\n"
-"  -c=? 이 설정 파일을 읽습니다\n"
-"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "파이프 만들기가 실패했습니다"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "gzip 실행이 실패했습니다"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "아카이브가 손상되었습니다"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "아카이브 서명이 틀렸습니다"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "아카이브 멤버 헤더를 읽는데 오류가 발생했습니다"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "아카이브 멤버 헤더 %s이(가) 잘못되었습니다"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "아카이브 멤버 헤더가 잘못되었습니다"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "아카이브 길이가 너무 짧습니다"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "아카이브 헤더를 읽는데 실패했습니다"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode가 아직 연결되어 있는 노드에 대해 호출되었습니다"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "해시 항목을 찾는데 실패했습니다"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "diversion을 할당하는데 실패했습니다"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "AddDiversion에서 내부 오류"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "전환된 파일을 덮어 쓰려고 합니다 (%s -> %s 및 %s/%s)"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "%s/%s 설정 파일이 중복되었습니다"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "%s 파일을 쓰는데 실패했습니다"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "%s 파일을 닫는데 실패했습니다"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "경로 %s이(가) 너무 깁니다"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s을(를) 두 번 이상 풀었습니다"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "%s 디렉터리가 전환되었습니다"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "이 패키지에서 전환된 대상에 쓰려고 합니다 (%s/%s)"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "전환하는 경로가 너무 깁니다"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s의 정보를 읽는데 실패했습니다"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "%s 디렉터리를 디렉터리가 아닌 파일로 덮어쓰려고 합니다"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "해시 버킷에서 노드를 찾는데 실패했습니다"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "경로가 너무 깁니다"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "덮어 쓰는 패키지가 %s 패키지의 어떤 버전과도 맞지 않습니다"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s의 정보를 읽을 수 없습니다"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "%s 파일을 쓰는데 실패했습니다"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "%s 파일을 닫는데 실패했습니다"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "내부 오류, %s 멤버를 찾을 수 없습니다"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "control 파일을 파싱할 수 없습니다"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "빈 파일에 메모리 매핑할 수 없습니다"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "%i 파일 디스크립터를 복사할 수 없습니다"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "%lu바이트를 메모리 매핑할 수 없습니다"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "mmap을 닫을 수 없습니다"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "mmap을 동기화할 수 없습니다"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "%lu바이트를 메모리 매핑할 수 없습니다"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "파일을 자르는데 실패했습니다"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"동적 mmap이 한계를 벗어났습니다. APT::Cache-Start의 크기를 높이십시오. 현재 "
-"값: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr "mmap 크기를 늘릴 수 없습니다. 이미 %lu 바이트 한계에 도달했습니다."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"mmap 크기를 늘릴 수 없습니다. 자동으로 늘리는 기능을 사용자가 금지했습니다."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li시간 %li분 %li초"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%li분 %li초"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%li초"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "선택한 %s이(가) 없습니다"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "이 타입 줄임말을 알 수 없습니다: '%c'"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "아카이브 서명이 틀렸습니다"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "설정 파일 %s 파일을 여는 중입니다"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "아카이브 멤버 헤더를 읽는데 오류가 발생했습니다"
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다."
+msgid "Invalid archive member header %s"
+msgstr "아카이브 멤버 헤더 %s이(가) 잘못되었습니다"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "아카이브 멤버 헤더가 잘못되었습니다"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "아카이브 길이가 너무 짧습니다"
 
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "아카이브 헤더를 읽는데 실패했습니다"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "파이프 만들기가 실패했습니다"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "문법 오류 %s:%u: 여기서 include됩니다"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "gzip 실행이 실패했습니다"
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "아카이브가 손상되었습니다"
 
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "문법 오류 %s:%u: clear 지시어는 인수로 option 트리를 지정해야 합니다"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... 오류!"
+msgid "Unable to stat %s."
+msgstr "%s의 정보를 읽을 수 없습니다."
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... 완료"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... 완료"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "명령행 옵션 '%c' 옵션을 [%s에서] 알 수 없습니다."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "명령행 옵션 '%s' 옵션을 알 수 없습니다"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "명령행 옵션 '%s' 옵션은 불리언이 아닙니다"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "%s 옵션에는 인수가 필요합니다."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "%s 옵션: 설정 항목 지정은 =<값> 형태여야 합니다."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "%s 옵션에는 정수 인수가 필요합니다. '%s'이(가) 아닙니다"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "'%s' 옵션이 너무 깁니다"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "%s 센스를 이해할 수 없습니다. 참 아니면 거짓으로 해 보십시오."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "잘못된 작업 %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "CD-ROM의 정보를 읽을 수 없습니다"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "%s gzip 파일을 닫는데 문제가 있습니다"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "잠금 파일 %s 파일을 열 수 없습니다"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "%s 잠금 파일을 얻을 수 없습니다"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "dpkg 실행하는 중입니다"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgid "Packaging system '%s' is not supported"
+msgstr "'%s' 패키지 시스템을 지원하지 않습니다"
 
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "올바른 패키지 시스템 타입을 알아낼 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgid "Wrote %i records.\n"
+msgstr "레코드 %i개를 썼습니다.\n"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "하위 프로세스 %s 프로세스가 %u번 시그널을 받았습니다."
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n"
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다"
+msgid "Can't find authentication record for: %s"
+msgstr "다음의 인증 기록을 찾을 수 없습니다: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file %s"
-msgstr "%s 파일을 열 수 없습니다"
+msgid "Hash mismatch for: %s"
+msgstr "다음의 해시가 다릅니다: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "%d 파일 디스크립터를 열 수 없습니다"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "하위 프로세스 IPC를 만드는데 실패했습니다"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "다음 압축 프로그램을 실행하는데 실패했습니다: "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다"
+msgid "The method driver %s could not be found."
+msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "%s 파일을 닫는데 문제가 있습니다"
+msgid "Method %s did not start correctly"
+msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "%s 파일을 삭제하는데 문제가 있습니다"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "파일을 동기화하는데 문제가 있습니다"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다."
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s에 키 모음을 설치하지 않았습니다."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "소스 목록을 읽을 수 없습니다."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "패키지 캐시가 비어 있습니다"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "패키지 캐시 파일이 손상되었습니다"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "패키지 캐시 파일이 호환되지 않는 버전입니다"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "패키지 캐시 파일이 손상되었습니다"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "이 APT는 '%s' 버전 시스템을 지원하지 않습니다"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "패키지 캐시가 다른 아키텍쳐용입니다."
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "의존"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "미리의존"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "제안"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "추천"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "충돌"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "대체"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "없앰"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "망가뜨림"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "향상"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "중요"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "필수"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "표준"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "옵션"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "별도"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "의존성 트리를 만드는 중입니다"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "후보 버전"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "의존성 만들기"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "상태 정보를 읽는 중입니다"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "상태파일 %s 여는데 실패했습니다"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "%s 파일을 여는 중입니다"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"'%s'에 대해 즉시 설정을 할 수 없습니다. 자세한 설명은 man 5 apt.conf 페이지에"
-"서 APT::Immediate-Configure 항목을 보십시오. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "'%s' 파일을 열 수 없습니다"
-
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"이번에 설치할 때 충돌/선의존성이 루프가 걸렸기 때문에 꼭 필요한 %s 패키지를 "
-"잠깐 제거해야 합니다. 이 패키지를 제거하는 건 좋지 않지만, 정말 지우려면 "
-"APT::Force-LoopBreak 옵션을 켜십시오."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수"
-"도 있습니다."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "목록 디렉터리 %spartial이 빠졌습니다."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "아카이브 디렉터리 %spartial이 빠졌습니다."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "%s 디렉터리를 잠글 수 없습니다"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "파일 받아오는 중: %2$li 중 %1$li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "'%s' 패키지 시스템을 지원하지 않습니다"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "올바른 패키지 시스템 타입을 알아낼 수 없습니다"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s의 정보를 읽을 수 없습니다."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다."
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다."
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "소스 목록을 읽을 수 없습니다."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "기본 설정 파일 %s에 잘못된 데이터가 있습니다. Package 헤더가 없습니다"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "캐시의 버전 시스템이 호환되지 않습니다"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "패키지 목록을 읽는 중입니다"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "파일에서 제공하는 것을 모으는 중입니다"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s에 쓸 수 없습니다"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "해시 합이 맞지 않습니다"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "크기가 맞지 않습니다"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "잘못된 작업 %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "다음 키 ID의 공개키가 없습니다:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3047,12 +2203,12 @@ msgstr ""
 "예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG 오류: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3061,90 +2217,152 @@ msgstr ""
 "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
 "니다. (아키텍쳐가 빠졌기 때문입니다)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "벤더 블럭 %s의 핑거프린트가 없습니다"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Release 파일 %s에 섹션이 없습니다"
+msgid "List directory %spartial is missing."
+msgstr "목록 디렉터리 %spartial이 빠졌습니다."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release 파일 %s에 Hash 항목이 없습니다"
+msgid "Archives directory %spartial is missing."
+msgstr "아카이브 디렉터리 %spartial이 빠졌습니다."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
+msgid "Unable to lock directory %s"
+msgstr "%s 디렉터리를 잠글 수 없습니다"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "벤더 블럭 %s의 핑거프린트가 없습니다"
+msgid "Retrieving file %li of %li"
+msgstr "파일 받아오는 중: %2$li 중 %1$li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거"
+"의 버전을 대신 사용합니다."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "기본 설정 파일 %s에 잘못된 데이터가 있습니다. Package 헤더가 없습니다"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"'%s'에 대해 즉시 설정을 할 수 없습니다. 자세한 설명은 man 5 apt.conf 페이지에"
+"서 APT::Immediate-Configure 항목을 보십시오. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "'%s' 파일을 열 수 없습니다"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/packagemanager.cc:577
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"이번에 설치할 때 충돌/선의존성이 루프가 걸렸기 때문에 꼭 필요한 %s 패키지를 "
+"잠깐 제거해야 합니다. 이 패키지를 제거하는 건 좋지 않지만, 정말 지우려면 "
+"APT::Force-LoopBreak 옵션을 켜십시오."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM을 마운트 해제하는 중입니다...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "CD-ROM 마운트 위치 %s 사용\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "CD-ROM 마운트 해제하는 중입니다\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "디스크를 기다리는 중입니다...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "CD-ROM 마운트하는 중입니다...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "알아보는 중입니다.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "알아보는 중입니다... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "저장된 레이블: %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM을 마운트 해제하는 중입니다...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "디스크에서 색인 파일을 찾는 중입니다...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "패키지 색인 %zu개, 소스 색인 %zu개, 번역 색인 %zu개, 서명 %zu개 발견\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3152,16 +2370,16 @@ msgstr ""
 "패키지 파일이 하나도 없습니다. 아마도 데비안 디스크가 아니거나 아키텍처가 잘"
 "못된 것 같습니다?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "레이블 발견: %s \n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3170,79 +2388,104 @@ msgstr ""
 "이 디스크는 다음과 같습니다: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "패키지 목록을 복사하는 중입니다..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "새 소스 리스트를 쓰는 중입니다\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "레코드 %i개를 썼습니다.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수"
+"도 있습니다."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "의존성 트리를 만드는 중입니다"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "후보 버전"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "의존성 만들기"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "상태 정보를 읽는 중입니다"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n"
+msgid "Failed to open StateFile %s"
+msgstr "상태파일 %s 여는데 실패했습니다"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "다음의 인증 기록을 찾을 수 없습니다: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "다음의 해시가 다릅니다: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "'%s' 작업을 찾을 수 없습니다"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3251,171 +2494,234 @@ msgstr ""
 "'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니"
 "다."
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다."
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다."
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다."
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Release 파일 %s에 섹션이 없습니다"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Release 파일 %s에 Hash 항목이 없습니다"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
+
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "dpkg 실행하는 중입니다"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거"
-"의 버전을 대신 사용합니다."
+"소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s 파일을 여는 중입니다"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "%s 설치하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "%s 설정 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "%s 패키지를 지우는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s 패키지를 완전히 지우는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s 사라짐 발견했습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "설치 후 트리거 %s 실행하는 중입니다"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "디렉터리 '%s' 없습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "'%s' 파일을 열 수 없습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "%s 준비 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s 푸는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s 패키지를 설정할 준비하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s 설치"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s 패키지를 지울 준비하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s 지움"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s 패키지를 완전히 지웠습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "%s에 쓸 수 없습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다."
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3423,20 +2729,20 @@ msgstr ""
 "보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수"
 "적인 오류입니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3444,13 +2750,13 @@ msgid ""
 msgstr ""
 "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "보고서를 작성하지 않습니다. 오류 메시지에 따르면 dpkg 입출력 오류입니다."
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3459,24 +2765,750 @@ msgstr ""
 "관리 디렉터리를 (%s) 잠글 수 없습니다. 다른 프로세스가 사용하고 있지 않습니"
 "까?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용자가 맞습니까?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg가 중단되었습니다. 수동으로 '%s' 명령을 실행해 문제점을 바로잡으십시오."
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "잠기지 않음"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li시간 %li분 %li초"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li분 %li초"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li초"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "선택한 %s이(가) 없습니다"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "잠금 파일 %s 파일을 열 수 없습니다"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "%s 잠금 파일을 얻을 수 없습니다"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "하위 프로세스 %s 프로세스가 %u번 시그널을 받았습니다."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "%s gzip 파일을 닫는데 문제가 있습니다"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "%s 파일을 열 수 없습니다"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "%d 파일 디스크립터를 열 수 없습니다"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "하위 프로세스 IPC를 만드는데 실패했습니다"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "다음 압축 프로그램을 실행하는데 실패했습니다: "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "%s 파일을 닫는데 문제가 있습니다"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "%s 파일을 삭제하는데 문제가 있습니다"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "파일을 동기화하는데 문제가 있습니다"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... 오류!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... 완료"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... 완료"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "빈 파일에 메모리 매핑할 수 없습니다"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "%i 파일 디스크립터를 복사할 수 없습니다"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "%lu바이트를 메모리 매핑할 수 없습니다"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "mmap을 닫을 수 없습니다"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "mmap을 동기화할 수 없습니다"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "%lu바이트를 메모리 매핑할 수 없습니다"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "파일을 자르는데 실패했습니다"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"동적 mmap이 한계를 벗어났습니다. APT::Cache-Start의 크기를 높이십시오. 현재 "
+"값: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr "mmap 크기를 늘릴 수 없습니다. 이미 %lu 바이트 한계에 도달했습니다."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"mmap 크기를 늘릴 수 없습니다. 자동으로 늘리는 기능을 사용자가 금지했습니다."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "CD-ROM의 정보를 읽을 수 없습니다"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "이 타입 줄임말을 알 수 없습니다: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "설정 파일 %s 파일을 여는 중입니다"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다."
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "문법 오류 %s:%u: 여기서 include됩니다"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "문법 오류 %s:%u: clear 지시어는 인수로 option 트리를 지정해야 합니다"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s에 키 모음을 설치하지 않았습니다."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "명령행 옵션 '%c' 옵션을 [%s에서] 알 수 없습니다."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "명령행 옵션 '%s' 옵션을 알 수 없습니다"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "명령행 옵션 '%s' 옵션은 불리언이 아닙니다"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "%s 옵션에는 인수가 필요합니다."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "%s 옵션: 설정 항목 지정은 =<값> 형태여야 합니다."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "%s 옵션에는 정수 인수가 필요합니다. '%s'이(가) 아닙니다"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "'%s' 옵션이 너무 깁니다"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "%s 센스를 이해할 수 없습니다. 참 아니면 거짓으로 해 보십시오."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "잘못된 작업 %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"사용법: apt-extracttemplates 파일1 [파일2 ...]\n"
+"\n"
+"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n"
+"도구입니다\n"
+"\n"
+"옵션:\n"
+"  -h   이 도움말\n"
+"  -t   임시 디렉토리 설정\n"
+"  -c=? 설정 파일을 읽습니다\n"
+"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s의 정보를 읽을 수 없습니다"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "패키지 확장 목록이 너무 깁니다"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "%s 디렉터리를 처리하는데 오류가 발생했습니다"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "소스 확장 목록이 너무 깁니다"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"사용법: apt-ftparchive [옵션] 명령\n"
+"명령: packages 바이너리경로 [override파일 [경로앞부분]]\n"
+"      sources 소스경로 [override파일 [경로앞부분]]\n"
+"      contents 경로\n"
+"      release 경로\n"
+"      generate 설정 [그룹]\n"
+"      clean 설정\n"
+"\n"
+"apt-ftparchive는 데비안 아카이브용 인덱스 파일을 만듭니다. 이 프로그램은\n"
+"여러 종류의 인덱스 파일 만드는 작업을 지원합니다 -- 완전 자동화 작업부터\n"
+"dpkg-scanpackages와 dpkg-scansources의 기능을 대체하기도 합니다.\n"
+"\n"
+"apt-ftparchive는 .deb 파일의 트리에서부터 Package 파일을 만듭니다.\n"
+"Package 파일에는 각 패키지의 모든 제어 필드는 물론 MD5 해시와 파일\n"
+"크기도 들어 있습니다. override 파일을 이용해 Priority와 Section의 값을 \n"
+"강제로 설정할 수 있습니다\n"
+"\n"
+"이와 비슷하게 apt-ftparchive는 .dsc 파일의 트리에서 Sources 파일을\n"
+"만듭니다. --source-override 옵션을 이용해 소스 override 파일을\n"
+"지정할 수 있습니다.\n"
+"\n"
+"'packages'와 'sources' 명령은 해당 트리의 맨 위에서 실행해야 합니다.\n"
+"\"바이너리경로\"는 검색할 때의 기준 위치를 가리키며 \"override파일\"에는\n"
+"override 플래그들을 담고 있습니다. \"경로앞부분\"은 각 파일 이름\n"
+"필드의 앞에 더해 집니다. 데비안 아카이브에 있는 예를 하나 들자면:\n"
+"\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"옵션:\n"
+"  -h    이 도움말\n"
+"  --md5 MD5 만들기 작업을 제어합니다\n"
+"  -s=?  소스 override 파일\n"
+"  -q    조용히\n"
+"  -d=?  캐시 데이터베이스를 직접 설정합니다\n"
+"  --no-delink 디버깅 모드 지우기를 사용합니다\n"
+"  --contents  컨텐츠 파일을 만드는 적업을 제어합니다\n"
+"  -c=?  이 설정 파일을 읽습니다\n"
+"  -o=?  임의의 옵션을 설정합니다"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "맞는 패키지가 없습니다"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "`%s' 패키지 파일 그룹에 몇몇 파일이 빠졌습니다"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB 형식이 잘못되었습니다. APT 예전 버전에서 업그레이드했다면, 데이터베이스를 "
+"지우고 다시 만드십시오."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "DB 파일, %s 파일을 열 수 없습니다: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "아카이브에 컨트롤 기록이 없습니다"
+
+# FIXME: 왠 커서??
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "커서를 가져올 수 없습니다"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "경고: %s의 정보를 읽을 수 없습니다\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "오류: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "경고: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "%s의 경로를 알아내는데 실패했습니다"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "트리에서 이동이 실패했습니다"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s 파일을 여는데 실패했습니다"
+
+# FIXME: ??
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " 링크 %s [%s] 없애기\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "%s 파일에 readlink하는데 실패했습니다"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "%s 파일을 지우는데 실패했습니다"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "아카이브에 패키지 필드가 없습니다"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s에는 override 항목이 없습니다\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s 관리자가 %s입니다 (%s 아님)\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s에는 source override 항목이 없습니다\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s에는 binary override 항목이 없습니다\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - 메모리를 할당하는데 실패했습니다"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s 열 수 없습니다"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "%s override 파일을 읽는데 실패했습니다"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "'%s' 압축 알고리즘을 알 수 없습니다"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "FILE*를 만드는데 실패했습니다"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "fork하는데 실패했습니다"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "압축 하위 프로세스"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "내부 오류, %s 만드는데 실패했습니다"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "MD5를 계산하는 동안 읽는데 실패했습니다"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "%s의 링크를 해제하는데 문제가 있습니다"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"사용법: apt-extracttemplates 파일1 [파일2 ...]\n"
+"\n"
+"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n"
+"도구입니다\n"
+"\n"
+"옵션:\n"
+"  -h   이 도움말\n"
+"  -t   임시 디렉토리 설정\n"
+"  -c=? 설정 파일을 읽습니다\n"
+"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "알 수 없는 패키지 기록!"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"사용법: apt-sortpkgs [옵션] 파일1 [파일2 ...]\n"
+"\n"
+"apt-sortpkgs는 패키지 파일을 정렬하는 간단한 도구입니다. -s 옵션은 무슨 파일"
+"인지\n"
+"알아 내는데 쓰입니다.\n"
+"\n"
+"옵션:\n"
+"  -h   이 도움말\n"
+"  -s   소스 파일 정렬을 사용합니다\n"
+"  -c=? 이 설정 파일을 읽습니다\n"
+"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s은(는) 올바른 DEB 패키지가 아닙니다."
 
diff --git a/po/ku.po b/po/ku.po
index 55d6f7765..4cc8983a9 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -19,156 +19,157 @@ msgstr ""
 "X-Generator: KAider 0.1\n"
 "Plural-Forms: nplurals=2; plural= n != 1;\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Navên paketan bi giştî :"
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Navên paketan bi giştî :"
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Pakêtên normal:"
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Pakêtên farazî yên safî:"
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Pakêta tenê ya farazî:"
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Pakêtên hevbeş yên farazî:"
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Winda: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Bindestên giştî:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Cihê giştî yê sist:"
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Cihê giştî yê veqetandî: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakêta dosya %s li derveyî demê ye."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Pakêt nayên dîtin"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Pêwist e tu mînakekê bidî"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Pakêt nehate dîtin %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Pelgehên Pakêt:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(nehate dîtin)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Sazkirî: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Berendam: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(ne tiştek)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Destika pakêtê:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Tabloya guhertoyan:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -205,29 +206,29 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Ji kerema xwe re navekî li vî Dîsketî bike, wekî 'Debian 2.1r1 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Anîna %s %s biserneket\n"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -263,65 +264,65 @@ msgstr ""
 "  -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. "
 "mînak -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Nikarî pakêta %s bibîne"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Nikarî pakêta %s bibîne"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Nikarî pakêta %s bibîne"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nikarî pakêta %s bibîne"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Pelrêça daxistinê nayê quflekirin"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
@@ -341,151 +342,151 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nikarî cihê vala li %s tesbît bike"
 
-#: cmdline/apt-get.cc:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Çavkanîna %s bîne\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Anîna çend arşîvan biserneket."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Girêdan bi %s (%s) re pêk tê"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -531,53 +532,73 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "lê ne sazkirî ye"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s venebû"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -604,7 +625,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -650,173 +671,175 @@ msgstr ""
 msgid "Disk not found."
 msgstr "Dîsk nehate dîtin."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Pel nehate dîtin"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 #, fuzzy
 msgid "Failed to stat"
 msgstr "%s venebû"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr ""
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Têketin"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Nikare navê herêmî tesbît bike"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr ""
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Çewiya xwendinê"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Çewtiya nivîsînê"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Serneket"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, fuzzy, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Danegira %s nehate vekirin: %s"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Lêpirsîn"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 #, fuzzy
 msgid "Unable to invoke "
 msgstr "%s venebû"
@@ -853,7 +876,7 @@ msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Bi %s re tê girêdan"
@@ -883,469 +906,299 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Nikare bi %s re girêdan pêk bîne %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Di xebitandina gpgv de çewtiya nenas"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Hilbijartin neserketî"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 #, fuzzy
 msgid "Error writing to output file"
 msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr ""
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Girêdan pêk nehatiye"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Çewtiya hundirîn"
 
-#: apt-private/private-list.cc:147
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-install.cc:93
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: apt-private/private-install.cc:102
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-
-#: apt-private/private-install.cc:121
-msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Anîna %sB/%sB ji arşîvan pêwist e.\n"
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Anîna %sB ji arşîvan pêwist e.\n"
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Bilindkirin tê hesibandin..."
 
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
 msgstr ""
 
-#: apt-private/private-install.cc:211
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Cihê vala li %s têre nake."
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Temam"
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
-msgid "There are problems and -y was used without --force-yes"
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
-msgid "Trivial Only specified but this is not a trivial operation."
+#: apt-private/private-list.cc:131
+msgid "Listing"
 msgstr ""
 
-#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
-#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
-msgid "Yes, do as I say!"
-msgstr "Erê, wusa bike!"
-
-#: apt-private/private-install.cc:233
+#: apt-private/private-list.cc:164
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
-msgid "Abort."
-msgstr "Betal."
-
-#: apt-private/private-install.cc:254
-msgid "Do you want to continue?"
-msgstr "Dixwazî bidomînî?"
-
-#: apt-private/private-install.cc:324
-msgid "Some files failed to download"
-msgstr "Daxistina çend pelan biserneket"
-
-#: apt-private/private-install.cc:331
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-
-#: apt-private/private-install.cc:335
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-
-#: apt-private/private-install.cc:340
-msgid "Unable to correct missing packages."
-msgstr ""
-
-#: apt-private/private-install.cc:341
-msgid "Aborting install."
-msgstr "Sazkirin tê betalkirin."
-
-#: apt-private/private-install.cc:377
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
+msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
+"There are %i additional versions. Please use the '-a' switch to see them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:402
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:510
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::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.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: apt-private/private-install.cc:517
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
-
-#: apt-private/private-install.cc:524
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
-msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
-
-#: apt-private/private-install.cc:528
-#, fuzzy, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
-msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
-
-#: apt-private/private-install.cc:530
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:624
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-
-#: apt-private/private-install.cc:626
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-
-#: apt-private/private-install.cc:639
-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 ""
-
-#: apt-private/private-install.cc:660
-msgid "Broken packages"
-msgstr "Paketên şikestî"
-
-#: apt-private/private-install.cc:713
-msgid "The following extra packages will be installed:"
-msgstr ""
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Bindestî tên serrastkirin..."
 
-#: apt-private/private-install.cc:803
-msgid "Suggested packages:"
-msgstr "Paketên tên pêşniyaz kirin:"
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " neserketî."
 
-#: apt-private/private-install.cc:804
-msgid "Recommended packages:"
-msgstr "Paketên tên tawsiyê kirin:"
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nikare bindestiyan rast kirin"
 
-#: apt-private/private-download.cc:32
-msgid "WARNING: The following packages cannot be authenticated!"
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "Authentication warning overridden.\n"
-msgstr ""
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Temam"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
-msgid "Some packages could not be authenticated"
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 
-#: apt-private/private-download.cc:46
-msgid "Install these packages without verification?"
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Anîna %s %s biserneket\n"
-
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:201
+#: apt-private/private-output.cc:232
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Sazkirî]"
 
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:236
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Sazkirî]"
 
-#: apt-private/private-output.cc:208
+#: apt-private/private-output.cc:239
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:210
+#: apt-private/private-output.cc:241
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Sazkirî]"
 
-#: apt-private/private-output.cc:212
+#: apt-private/private-output.cc:243
 #, fuzzy
 msgid "[installed]"
 msgstr " [Sazkirî]"
 
-#: apt-private/private-output.cc:216
+#: apt-private/private-output.cc:247
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:220
+#: apt-private/private-output.cc:251
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:320
+#: apt-private/private-output.cc:351
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: apt-private/private-output.cc:410
+#: apt-private/private-output.cc:441
 #, c-format
 msgid "but %s is installed"
 msgstr "lê %s sazkirî ye"
 
-#: apt-private/private-output.cc:412
+#: apt-private/private-output.cc:443
 #, c-format
 msgid "but %s is to be installed"
 msgstr "lê %s dê were sazkirin"
 
-#: apt-private/private-output.cc:419
+#: apt-private/private-output.cc:450
 msgid "but it is not installable"
 msgstr "lê sazkirina wê ne gengaz e"
 
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:452
 msgid "but it is a virtual package"
 msgstr "lê paketeke farazî ye"
 
-#: apt-private/private-output.cc:424
+#: apt-private/private-output.cc:455
 msgid "but it is not installed"
 msgstr "lê ne sazkirî ye"
 
-#: apt-private/private-output.cc:424
+#: apt-private/private-output.cc:455
 msgid "but it is not going to be installed"
 msgstr "lê dê neyê sazkirin"
 
-#: apt-private/private-output.cc:429
+#: apt-private/private-output.cc:460
 msgid " or"
 msgstr " û"
 
-#: apt-private/private-output.cc:458
+#: apt-private/private-output.cc:489
 msgid "The following NEW packages will be installed:"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: apt-private/private-output.cc:484
+#: apt-private/private-output.cc:515
 msgid "The following packages will be REMOVED:"
 msgstr "Ev pakêt dê werine RAKIRIN:"
 
-#: apt-private/private-output.cc:506
+#: apt-private/private-output.cc:537
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: apt-private/private-output.cc:527
+#: apt-private/private-output.cc:558
 msgid "The following packages will be upgraded:"
 msgstr "Ev paket dê werine bilindkirin:"
 
-#: apt-private/private-output.cc:548
+#: apt-private/private-output.cc:579
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: apt-private/private-output.cc:568
+#: apt-private/private-output.cc:599
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: apt-private/private-output.cc:623
+#: apt-private/private-output.cc:654
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (ji ber %s)"
 
-#: apt-private/private-output.cc:631
+#: apt-private/private-output.cc:662
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:693
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
 
-#: apt-private/private-output.cc:666
+#: apt-private/private-output.cc:697
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ji nû ve sazkirî,"
 
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:699
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu hatine nizmkirin."
 
-#: apt-private/private-output.cc:670
+#: apt-private/private-output.cc:701
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
 
-#: apt-private/private-output.cc:674
+#: apt-private/private-output.cc:705
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
@@ -1354,7 +1207,7 @@ msgstr ""
 #. e.g. "Do you want to continue? [Y/n] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:727
 #, fuzzy
 msgid "[Y/n]"
 msgstr "[E/n]"
@@ -1363,90 +1216,243 @@ msgstr "[E/n]"
 #. e.g. "Should this file be removed? [y/N] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
+#: apt-private/private-output.cc:733
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:744
 msgid "Y"
 msgstr "E"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
+#: apt-private/private-output.cc:750
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Bindestî tên serrastkirin..."
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
 
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " neserketî."
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Nikare bindestiyan rast kirin"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
 
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Temam"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr ""
 
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Anîna %sB/%sB ji arşîvan pêwist e.\n"
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Anîna %sB ji arşîvan pêwist e.\n"
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Bilindkirin tê hesibandin..."
+#: apt-private/private-install.cc:199
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Cihê vala li %s têre nake."
 
-#: apt-private/private-upgrade.cc:24
-msgid "Internal error, Upgrade broke stuff"
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
+msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Temam"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: apt-private/private-show.cc:152
+#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
+#. careful with hard to type or special characters (like non-breaking spaces)
+#: apt-private/private-install.cc:219
+msgid "Yes, do as I say!"
+msgstr "Erê, wusa bike!"
+
+#: apt-private/private-install.cc:221
 #, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+msgid "Abort."
+msgstr "Betal."
+
+#: apt-private/private-install.cc:242
+msgid "Do you want to continue?"
+msgstr "Dixwazî bidomînî?"
+
+#: apt-private/private-install.cc:312
+msgid "Some files failed to download"
+msgstr "Daxistina çend pelan biserneket"
+
+#: apt-private/private-install.cc:319
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: apt-private/private-install.cc:323
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+
+#: apt-private/private-install.cc:328
+msgid "Unable to correct missing packages."
+msgstr ""
+
+#: apt-private/private-install.cc:329
+msgid "Aborting install."
+msgstr "Sazkirin tê betalkirin."
+
+#: apt-private/private-install.cc:365
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
 msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
+#: apt-private/private-install.cc:369
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:390
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: apt-private/private-install.cc:498
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::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.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+
+#: apt-private/private-install.cc:505
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: apt-private/private-install.cc:512
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
+msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
+
+#: apt-private/private-install.cc:516
+#, fuzzy, c-format
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
+msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
+
+#: apt-private/private-install.cc:518
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:612
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+
+#: apt-private/private-install.cc:614
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
 msgstr ""
 
-#: apt-private/private-main.cc:19
+#: apt-private/private-install.cc:627
+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 ""
+
+#: apt-private/private-install.cc:648
+msgid "Broken packages"
+msgstr "Paketên şikestî"
+
+#: apt-private/private-install.cc:701
+msgid "The following extra packages will be installed:"
+msgstr ""
+
+#: apt-private/private-install.cc:791
+msgid "Suggested packages:"
+msgstr "Paketên tên pêşniyaz kirin:"
+
+#: apt-private/private-install.cc:792
+msgid "Recommended packages:"
+msgstr "Paketên tên tawsiyê kirin:"
+
+#: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1454,43 +1460,68 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-sources.cc:45
+#: apt-private/private-download.cc:31
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+
+#: apt-private/private-download.cc:35
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: apt-private/private-download.cc:45
+msgid "Install these packages without verification?"
+msgstr ""
+
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Anîna %s %s biserneket\n"
+
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "%s ji hev nehate veçirandin"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr ""
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Anîn:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr ""
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Çewt"
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, fuzzy, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s hatine anîn..."
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Dixebite]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1500,19 +1531,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nikare %s bixwîne"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nikarî derbasa %s bike"
@@ -1541,11 +1572,11 @@ msgstr "Nikarî pelê %s veke"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Girêdan zû hatiye girtin"
 
@@ -1583,1694 +1614,1695 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Di şixulandina pêrista %s de çewtî"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Dema şixulandina naveroka %s çewtî"
-
-#: ftparchive/apt-ftparchive.cc:597
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
 
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Danegira %s nehate vekirin: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Tomara kontrola arşîvê tuneye"
+#: apt-inst/filelist.cc:459
+#, fuzzy
+msgid "Failed to allocate diversion"
+msgstr "%s venebû"
 
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: ftparchive/writer.cc:82
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: pelrêça %s nayê xwendin\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "%s ji hev nehate veçirandin"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s venebû"
-
-#: ftparchive/writer.cc:269
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:277
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr ""
+msgid "The path %s is too long"
+msgstr "Rêça %s zêde dirêj e"
 
-#: ftparchive/writer.cc:281
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
+msgid "Unpacking %s more than once"
 msgstr ""
 
-#: ftparchive/writer.cc:289
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
+msgid "The directory %s is diverted"
 msgstr ""
 
-#: ftparchive/writer.cc:299
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Di arşîvê de qada pakêtê tuneye"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr ""
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+#, fuzzy
+msgid "The diversion path is too long"
+msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
 
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
+msgid "Failed to stat %s"
 msgstr ""
 
-#: ftparchive/writer.cc:712
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:716
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s venebû"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr ""
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Rêç zêde dirêj e"
 
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Failed to read the override file %s"
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: ftparchive/override.cc:163
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu #1"
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr ""
+#: apt-inst/extract.cc:498
+#, fuzzy, c-format
+msgid "Unable to stat %s"
+msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: ftparchive/override.cc:188
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgid "Failed to write file %s"
+msgstr "Nivîsîna pelê %s biserneket"
 
-#: ftparchive/multicompress.cc:71
+#: apt-inst/dirstream.cc:105
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr ""
+msgid "Failed to close file %s"
+msgstr "Girtina pelê %s biserneket"
 
-#: ftparchive/multicompress.cc:101
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr ""
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr ""
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr ""
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: ftparchive/multicompress.cc:230
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Internal error, failed to create %s"
+msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
 msgstr ""
 
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
 msgstr ""
 
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
 msgstr ""
 
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Failed to rename %s to %s"
+msgid "Invalid archive member header %s"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
 msgstr ""
-"Bikaranîn: apt-config [vebijark] ferman\n"
-"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n"
-"\n"
-"Ferman\n"
-"  shell - moda shell\n"
-"  dump - Mîhengan nîşan dide\n"
-"\n"
-"Vebijark:\n"
-"  -h Ev dosyeya alîkariyê ye.\n"
-"  -c=? Dosyeya mîhengan nîşan dide\n"
-"  -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. "
-"mînak -o dir::cache=/tmp\n"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arşîv zêde kin e"
 
-#: cmdline/apt-sortpkgs.cc:153
-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"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:122
+#: apt-inst/contrib/extracttar.cc:124
 #, fuzzy
 msgid "Failed to create pipes"
 msgstr "%s ji hev nehate veçirandin"
 
-#: apt-inst/contrib/extracttar.cc:149
+#: apt-inst/contrib/extracttar.cc:151
 msgid "Failed to exec gzip "
 msgstr "Xebitandina gzip biserneket"
 
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
 msgid "Corrupted archive"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:201
+#: apt-inst/contrib/extracttar.cc:203
 msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:306
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr ""
+#: apt-pkg/clean.cc:61
+#, fuzzy, c-format
+msgid "Unable to stat %s."
+msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: apt-inst/contrib/arfile.cc:94
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arşîv zêde kin e"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-inst/filelist.cc:382
-msgid "DropNode called on still linked node"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-inst/filelist.cc:414
-msgid "Failed to locate the hash element!"
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-inst/filelist.cc:461
-#, fuzzy
-msgid "Failed to allocate diversion"
-msgstr "%s venebû"
-
-#: apt-inst/filelist.cc:466
-msgid "Internal error in AddDiversion"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-inst/filelist.cc:479
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
+msgid "Wrote %i records.\n"
+msgstr "%i tomar hatin nivîsîn.\n"
 
-#: apt-inst/filelist.cc:508
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Double add of diversion %s -> %s"
+msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:551
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Duplicate conf file %s/%s"
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Nivîsîna pelê %s biserneket"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
 
-#: apt-inst/dirstream.cc:106
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Girtina pelê %s biserneket"
+msgid "Can't find authentication record for: %s"
+msgstr ""
 
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
-#, c-format
-msgid "The path %s is too long"
-msgstr "Rêça %s zêde dirêj e"
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash Sum li hev nayên"
 
-#: apt-inst/extract.cc:125
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Unpacking %s more than once"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-inst/extract.cc:135
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "The directory %s is diverted"
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-inst/extract.cc:145
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
-#, fuzzy
-msgid "The diversion path is too long"
-msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
+#: apt-pkg/acquire-worker.cc:455
+#, 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-inst/extract.cc:242
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-inst/extract.cc:282
-msgid "Failed to locate node in its hash bucket"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-inst/extract.cc:286
-msgid "The path is too long"
-msgstr "Rêç zêde dirêj e"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr ""
 
-#: apt-inst/extract.cc:414
-#, c-format
-msgid "Overwrite package match with no version for %s"
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
 msgstr ""
 
-#: apt-inst/extract.cc:431
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-inst/extract.cc:491
-#, fuzzy, c-format
-msgid "Unable to stat %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
+msgstr ""
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-pkg/pkgcache.cc:174
 #, c-format
-msgid "Internal error, could not locate member %s"
+msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:219
-msgid "Unparsable control file"
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr ""
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Bindest"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "PêşBindest"
 
-#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Nikarî li %s biguherîne"
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Pêşniyaz dike"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "%s venebû"
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Tawsiye dike"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "%s venebû"
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Nakokî"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Dikeve şunve"
 
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Nivîsîna pelê %s biserneket"
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Kevin dike"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Dişkîne"
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "girîng"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "pêwist"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standard"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opsiyonel"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "ekstra"
+
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "%lih %limin %lis"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Dema şixulandina naveroka %s çewtî"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Hilbijartina %s nehatiye dîtin"
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:804
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
-msgid "Syntax error %s:%u: Malformed tag"
+msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Lîsteya pakêtan tê xwendin"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:861
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
 #, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid "Unable to write to %s"
+msgstr "Nivîsandin ji bo %s ne pêkane"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Çewtî!"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "nav guherandin biserneket, %s (%s -> %s)"
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Çêbû"
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Hash Sum li hev nayên"
 
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Mezinahî li hev nayên"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/acquire-item.cc:1579
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Çêbû"
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
+#: apt-pkg/acquire-item.cc:1637
+msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
-msgid "Command line option %s is not understood"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
-msgid "Command line option %s is not boolean"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
-msgid "Option %s requires an argument."
+msgid ""
+"An error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:273
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+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/contrib/cmndline.cc:304
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Opsiyona '%s' zêde dirêj e"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:336
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
-msgid "Sense %s is not understood, try true or false."
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:386
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Invalid operation %s"
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
+msgid "List directory %spartial is missing."
+msgstr "Peldanka '%s' kêm e"
 
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr ""
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "Peldanka '%s' kêm e"
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/acquire.cc:99
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Di girtina pelî de pirsgirêkek derket"
+msgid "Unable to lock directory %s"
+msgstr "W: pelrêça %s nayê xwendin\n"
 
-#: apt-pkg/contrib/fileutl.cc:228
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Not using locking for read only lock file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Could not open lock file %s"
-msgstr "Nikarî qufila pelê %s veke"
+msgid "Retrieving file %li of %li"
+msgstr "Pel tê anîn %li ji %li"
 
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/policy.cc:422
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nikarî pelê %s veke"
+
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Sub-process %s received signal %u."
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/cdrom.cc:586
 #, c-format
-msgid "Could not open file %s"
-msgstr "Nikarî pelê %s veke"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Nikarî pelê %s veke"
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
+#: apt-pkg/cdrom.cc:599
+msgid "Waiting for disc...\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
+#: apt-pkg/cdrom.cc:609
+msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1326
-#, c-format
-msgid "read, still have %llu to read but none left"
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/cdrom.cc:662
 #, c-format
-msgid "write, still have %llu to write but couldn't"
+msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Di girtina pelî de pirsgirêkek derket"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Di girtina pelî de pirsgirêkek derket"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Di girtina pelî de pirsgirêkek derket"
+#: apt-pkg/cdrom.cc:734
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
+#: apt-pkg/cdrom.cc:744
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Sazkirin tê betalkirin."
+#: apt-pkg/cdrom.cc:771
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "Etîketa '%s' hatiye dîtin\n"
 
-#: apt-pkg/pkgcache.cc:148
-msgid "Empty package cache"
+#: apt-pkg/cdrom.cc:800
+msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:154
-msgid "The package cache file is corrupted"
+#: apt-pkg/cdrom.cc:817
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
 msgstr ""
+"Navê dîskê: \n"
+"'%s'\n"
 
-#: apt-pkg/pkgcache.cc:159
-msgid "The package cache file is an incompatible version"
+#: apt-pkg/cdrom.cc:819
+msgid "Copying package lists..."
+msgstr "Lîsteyên pakêtan tên jibergirtin..."
+
+#: apt-pkg/cdrom.cc:863
+msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:162
-msgid "The package cache file is corrupted, it is too small"
+#: apt-pkg/cdrom.cc:874
+msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:172
-msgid "The package cache was built for a different architecture"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:314
-msgid "Depends"
-msgstr "Bindest"
-
-#: apt-pkg/pkgcache.cc:314
-msgid "PreDepends"
-msgstr "PêşBindest"
-
-#: apt-pkg/pkgcache.cc:314
-msgid "Suggests"
-msgstr "Pêşniyaz dike"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Recommends"
-msgstr "Tawsiye dike"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Conflicts"
-msgstr "Nakokî"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Replaces"
-msgstr "Dikeve şunve"
-
-#: apt-pkg/pkgcache.cc:316
-msgid "Obsoletes"
-msgstr "Kevin dike"
-
-#: apt-pkg/pkgcache.cc:316
-msgid "Breaks"
-msgstr "Dişkîne"
-
-#: apt-pkg/pkgcache.cc:316
-msgid "Enhances"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
-msgid "important"
-msgstr "girîng"
-
-#: apt-pkg/pkgcache.cc:327
-msgid "required"
-msgstr "pêwist"
-
-#: apt-pkg/pkgcache.cc:327
-msgid "standard"
-msgstr "standard"
-
-#: apt-pkg/pkgcache.cc:328
-msgid "optional"
-msgstr "opsiyonel"
-
-#: apt-pkg/pkgcache.cc:328
-msgid "extra"
-msgstr "ekstra"
-
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:133
+#: apt-pkg/depcache.cc:139
 msgid "Candidate versions"
 msgstr "Guhartoyên berendam"
 
-#: apt-pkg/depcache.cc:162
+#: apt-pkg/depcache.cc:168
 msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
 msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/depcache.cc:244
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Vekirina StateFile %s biserneket"
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/depcache.cc:256
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s ji hev nehate veçirandin"
 
-#: apt-pkg/tagfile.cc:138
+#: apt-pkg/tagfile.cc:140
 #, fuzzy, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/tagfile.cc:235
+#: apt-pkg/tagfile.cc:237
 #, fuzzy, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/sourcelist.cc:118
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Peywira %s nehate dîtin"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nikarî pakêta %s bibîne"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nikarî pakêta %s bibîne"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Pakêt nehate dîtin %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Pakêt nehate dîtin %s"
+
+#: apt-pkg/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:161
+#: apt-pkg/sourcelist.cc:170
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:173
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:175
+#: apt-pkg/sourcelist.cc:184
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:181
+#: apt-pkg/sourcelist.cc:190
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/sourcelist.cc:193
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:197
+#: apt-pkg/sourcelist.cc:206
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:208
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:211
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:217
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:215
+#: apt-pkg/sourcelist.cc:224
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:326
+#: apt-pkg/sourcelist.cc:335
 #, c-format
 msgid "Opening %s"
 msgstr "%s tê vekirin"
 
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:362
+#: apt-pkg/sourcelist.cc:371
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:366
+#: apt-pkg/sourcelist.cc:375
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:407
+#: apt-pkg/sourcelist.cc:416
 #, c-format
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
+#: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nikarî pelê %s veke"
+msgid "Installing %s"
+msgstr "%s hatine sazkirin"
 
-#: apt-pkg/packagemanager.cc:570
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, 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 ""
+msgid "Configuring %s"
+msgstr "%s tê mîhengkirin"
 
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
+msgid "Removing %s"
+msgstr "%s tê rakirin"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s bi tevahî hatine rakirin"
 
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
+#: apt-pkg/deb/dpkgpm.cc:99
+#, c-format
+msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
+#: apt-pkg/deb/dpkgpm.cc:100
+#, c-format
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:827
+#, c-format
+msgid "Directory '%s' missing"
 msgstr "Peldanka '%s' kêm e"
 
-#: apt-pkg/acquire.cc:85
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Peldanka '%s' kêm e"
+msgid "Could not open file '%s'"
+msgstr "Nikarî pelê %s veke"
 
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "W: pelrêça %s nayê xwendin\n"
+#: apt-pkg/deb/dpkgpm.cc:989
+#, c-format
+msgid "Preparing %s"
+msgstr "%s tê amadekirin"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
+msgid "Unpacking %s"
+msgstr "%s tê derxistin"
 
-#: apt-pkg/acquire.cc:895
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Pel tê anîn %li ji %li"
+msgid "Preparing to configure %s"
+msgstr "Mîhengkirina %s tê amadekirin"
 
-#: apt-pkg/acquire-worker.cc:113
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
+msgid "Installed %s"
+msgstr "%s hatine sazkirin"
 
-#: apt-pkg/acquire-worker.cc:115
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
-msgid "Is the package %s installed?"
-msgstr ""
+msgid "Preparing for removal of %s"
+msgstr "Rakirina %s tê amadekirin"
 
-#: apt-pkg/acquire-worker.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
+msgid "Removed %s"
+msgstr "%s hatine rakirin"
 
-#: apt-pkg/acquire-worker.cc:452
-#, 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/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Bi tevahî rakirina %s tê amadekirin"
 
-#: apt-pkg/init.cc:143
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr ""
+msgid "Completely removed %s"
+msgstr "%s bi tevahî hatine rakirin"
 
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
+#: apt-pkg/deb/dpkgpm.cc:1066
+msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/clean.cc:57
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
-msgid "Unable to stat %s."
+msgid "Can not write log (%s)"
 msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
+#: apt-pkg/deb/dpkgpm.cc:1069
+msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-pkg/deb/dpkgpm.cc:1090
+msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-pkg/deb/dpkgpm.cc:1568
+msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
+#: apt-pkg/deb/dpkgpm.cc:1630
+msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1635
+msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+#: apt-pkg/deb/dpkgpm.cc:1637
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
 msgstr ""
 
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
+#: apt-pkg/deb/dpkgpm.cc:1643
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
 msgstr ""
 
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
+#: apt-pkg/deb/dpkgpm.cc:1650
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:87
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
 msgstr ""
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Dema şixulandina naveroka %s çewtî"
-
-#: apt-pkg/pkgcachegen.cc:251
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/deb/dpkgpm.cc:1684
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:254
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Pelrêça daxistinê nayê quflekirin"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:570
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1199
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
-msgid "Reading package lists"
-msgstr "Lîsteya pakêtan tê xwendin"
-
-#: apt-pkg/pkgcachegen.cc:1304
-msgid "Collecting File Provides"
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
-msgid "IO Error saving source cache"
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/contrib/strutl.cc:1236
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "nav guherandin biserneket, %s (%s -> %s)"
+msgid "Selection %s not found"
+msgstr "Hilbijartina %s nehatiye dîtin"
 
-#: apt-pkg/acquire-item.cc:154
-msgid "Hash Sum mismatch"
-msgstr "Hash Sum li hev nayên"
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:159
-msgid "Size mismatch"
-msgstr "Mezinahî li hev nayên"
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Nikarî qufila pelê %s veke"
 
-#: apt-pkg/acquire-item.cc:164
-msgid "Invalid file format"
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/contrib/fileutl.cc:223
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Pakêt nehate dîtin %s"
-
-#: apt-pkg/acquire-item.cc:1628
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/contrib/fileutl.cc:394
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/contrib/fileutl.cc:412
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/contrib/fileutl.cc:421
 #, c-format
 msgid ""
-"An error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/contrib/fileutl.cc:824
 #, c-format
-msgid "GPG error: %s: %s"
+msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/contrib/fileutl.cc:826
 #, 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)"
+msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/contrib/fileutl.cc:913
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Pakêt nehate dîtin %s"
+msgid "Problem closing the gzip file %s"
+msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/contrib/fileutl.cc:1101
 #, c-format
-msgid "No sections in Release file %s"
+msgid "Could not open file %s"
+msgstr "Nikarî pelê %s veke"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nikarî pelê %s veke"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/contrib/fileutl.cc:1513
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/contrib/fileutl.cc:1913
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Pakêt nehate dîtin %s"
+msgid "Problem closing the file %s"
+msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/vendorlist.cc:78
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Di girtina pelî de pirsgirêkek derket"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Di girtina pelî de pirsgirêkek derket"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr ""
+msgid "%c%s... Error!"
+msgstr "%c%s... Çewtî!"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr ""
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Çêbû"
 
-#: apt-pkg/cdrom.cc:588
-msgid "Waiting for disc...\n"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:597
-msgid "Mounting CD-ROM...\n"
-msgstr ""
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Çêbû"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/contrib/mmap.cc:111
 #, c-format
-msgid "Stored label: %s\n"
+msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr ""
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Nikarî li %s biguherîne"
 
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr ""
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "%s venebû"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "%s venebû"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/contrib/mmap.cc:290
 #, c-format
-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
+msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Nivîsîna pelê %s biserneket"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
 msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/contrib/mmap.cc:446
 #, c-format
-msgid "Found label '%s'\n"
-msgstr "Etîketa '%s' hatiye dîtin\n"
-
-#: apt-pkg/cdrom.cc:784
-msgid "That is not a valid name, try again.\n"
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:801
-#, c-format
+#: apt-pkg/contrib/mmap.cc:449
 msgid ""
-"This disc is called: \n"
-"'%s'\n"
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
-"Navê dîskê: \n"
-"'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
-msgid "Copying package lists..."
-msgstr "Lîsteyên pakêtan tên jibergirtin..."
+#: apt-pkg/contrib/cdromutl.cc:65
+#, fuzzy, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: apt-pkg/cdrom.cc:838
-msgid "Writing new source list\n"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:846
-msgid "Source list entries for this disc are:\n"
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/contrib/configuration.cc:633
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i tomar hatin nivîsîn.\n"
+msgid "Opening configuration file %s"
+msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash Sum li hev nayên"
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid "Release '%s' for '%s' was not found"
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Version '%s' for '%s' was not found"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:593
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Peywira %s nehate dîtin"
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:599
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nikarî pakêta %s bibîne"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:605
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Nikarî pakêta %s bibîne"
+msgid "No keyring installed in %s."
+msgstr "Sazkirin tê betalkirin."
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opsiyona '%s' zêde dirêj e"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
 
-#: apt-pkg/install-progress.cc:51
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nivîsandin ji bo %s ne pêkane"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Error processing directory %s"
+msgstr "Di şixulandina pêrista %s de çewtî"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Dema şixulandina naveroka %s çewtî"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
 msgstr ""
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide"
+
+#: ftparchive/cachedb.cc:80
 msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:91
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "%s hatine sazkirin"
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Danegira %s nehate vekirin: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Tomara kontrola arşîvê tuneye"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/writer.cc:91
 #, c-format
-msgid "Configuring %s"
-msgstr "%s tê mîhengkirin"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: pelrêça %s nayê xwendin\n"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: ftparchive/writer.cc:96
 #, c-format
-msgid "Removing %s"
-msgstr "%s tê rakirin"
+msgid "W: Unable to stat %s\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:94
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s bi tevahî hatine rakirin"
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Noting disappearance of %s"
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "Failed to resolve %s"
+msgstr "%s ji hev nehate veçirandin"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
 msgstr ""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: ftparchive/writer.cc:219
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Peldanka '%s' kêm e"
+msgid "Failed to open %s"
+msgstr "%s venebû"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Nikarî pelê %s veke"
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: ftparchive/writer.cc:286
 #, c-format
-msgid "Preparing %s"
-msgstr "%s tê amadekirin"
+msgid "Failed to readlink %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: ftparchive/writer.cc:290
 #, c-format
-msgid "Unpacking %s"
-msgstr "%s tê derxistin"
+msgid "Failed to unlink %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: ftparchive/writer.cc:298
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Mîhengkirina %s tê amadekirin"
+msgid "*** Failed to link %s to %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: ftparchive/writer.cc:308
 #, c-format
-msgid "Installed %s"
-msgstr "%s hatine sazkirin"
+msgid " DeLink limit of %sB hit.\n"
+msgstr ""
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Di arşîvê de qada pakêtê tuneye"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Rakirina %s tê amadekirin"
+msgid "  %s has no override entry\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
 #, c-format
-msgid "Removed %s"
-msgstr "%s hatine rakirin"
+msgid "  %s maintainer is %s not %s\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: ftparchive/writer.cc:721
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Bi tevahî rakirina %s tê amadekirin"
+msgid "  %s has no source override entry\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: ftparchive/writer.cc:725
 #, c-format
-msgid "Completely removed %s"
-msgstr "%s bi tevahî hatine rakirin"
+msgid "  %s has no binary override entry either\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1046
-msgid "ioctl(TIOCGWINSZ) failed"
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Nivîsandin ji bo %s ne pêkane"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s venebû"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
-msgid "Is /dev/pts mounted?"
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
-msgid "Is stdout a terminal?"
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
-msgid "Operation was interrupted before it could finish"
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
-msgid "No apport report written because MaxReports is reached already"
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
-msgid "dependency problems - leaving unconfigured"
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "Internal error, failed to create %s"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Pelrêça daxistinê nayê quflekirin"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr ""
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr ""
+
+#: ftparchive/multicompress.cc:359
 #, c-format
+msgid "Problem unlinking %s"
+msgstr ""
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
 msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Bikaranîn: apt-config [vebijark] ferman\n"
+"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n"
+"\n"
+"Ferman\n"
+"  shell - moda shell\n"
+"  dump - Mîhengan nîşan dide\n"
+"\n"
+"Vebijark:\n"
+"  -h Ev dosyeya alîkariyê ye.\n"
+"  -c=? Dosyeya mîhengan nîşan dide\n"
+"  -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. "
+"mînak -o dir::cache=/tmp\n"
 
-#: apt-pkg/deb/debsystem.cc:121
-msgid "Not locked"
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
 
 #~ msgid "%s not a valid DEB package."
diff --git a/po/lt.po b/po/lt.po
index f707ff448..6c7f20186 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -18,155 +18,156 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2008-08-02 05:04+0000\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 #, fuzzy
 msgid "Total package names: "
 msgstr "Visi paketų pavadinimai: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Visi paketų pavadinimai: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Normalūs paketai: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Pavieniai virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Mišrūs virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Trūksta: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Viso skirtingų versijų: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Viso skirtingų aprašymų: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Viso priklausomybių: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Viso versijų/failų santykių yra: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Viso aprašymų/failų santykių yra: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Paketų nerasta"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Paketų failai:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Surišti paketai:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(nerasta)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Įdiegta: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Kandidatas: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(nėra)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Paketo susiejimai: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Versijų lentelė:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -203,28 +204,28 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Prašome įdėti diską į įrenginį ir paspausti Enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Nepavyko pervadinti %s į %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Pakartokite šitą procesą su kitais CD savo rinkinyje."
 
@@ -260,65 +261,65 @@ msgstr ""
 "  -c=? Nuskaityti pateiktą konfigūracijos failą\n"
 "  -o=? Nurodyti tam tikrą konfigūracijos parametrą, pvz -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Nepavyko užrakinti parsiuntimų aplanko"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
@@ -338,95 +339,95 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nepavyko nustatyti %s laisvos vietos"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Neturite pakankamai laisvos vietos %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Reikia parsiųsti %sB išeities archyvų.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Parsiunčiamas archyvas %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Nepavyko gauti kai kurių arhcyvų."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Pavyko parsiųsti tik parsiuntimo režime"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Klaida procese-palikuonyje"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -434,7 +435,7 @@ msgid ""
 msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -442,14 +443,14 @@ msgid ""
 msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -458,7 +459,7 @@ msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
 "versijos %s paketo"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -466,30 +467,30 @@ msgid ""
 msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Nepavyko patenkinti %s priklausomybės %s: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Jungiamasi prie %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Palaikomi moduliai:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -535,53 +536,74 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "bet jis nėra įdiegtas"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ir taip jau yra naujausias.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ir taip jau yra naujausias.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Nepavyko atverti %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -608,7 +630,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -654,172 +676,174 @@ msgstr "Nepavyko atjungti CD-ROM įrenginyje %s, galbūt jis vis dar naudojamas.
 msgid "Disk not found."
 msgstr "Diskas nerastas."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Failas nerastas"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr ""
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Jungiamasi"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Jungiamasi per ilgai"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Skaitymo klaida"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Rašymo klaida"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Nepavyko"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nepavyko atsiųsti failo, serveris atsakė „%s“"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Užklausti"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr ""
 
@@ -855,7 +879,7 @@ msgstr "Nepavyko prisijungti prie %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Jungiamasi prie %s"
@@ -885,181 +909,416 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Nepavyko prisijungti prie %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Nežinoma klaida kviečiant gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Šie parašai buvo nevalidūs:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Klaida bandant rašyti į failą"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Prisijungimo laiko limitas baigėsi"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Laukiama antraščių"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr ""
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Prisijungti nepavyko"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Vidinė klaida"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Skaičiuojami atnaujinimai... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Įvykdyta"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Taisomos priklausomybės..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " nepavyko."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nepavyko patenkinti priklausomybių"
+
+#: apt-private/private-cachefile.cc:102
+#, fuzzy
+msgid "Unable to minimize the upgrade set"
+msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Įvykdyta"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Šie paketai turi neįdiegtų priklausomybių:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "bet %s yra įdiegtas"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "bet %s bus įdiegtas"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "tačiau jis negali būti įdiegtas"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "bet tai yra virtualus paketas"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "bet jis nėra įdiegtas"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "bet jis nebus įdiegtas"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " arba"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Bus įdiegti šie NAUJI paketai:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Bus PAŠALINTI šie paketai:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Šių paketų atnaujinimas sulaikomas:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Bus atnaujinti šie paketai:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Bus pakeisti šie sulaikyti paketai:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (dėl %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"Įspėjimas: Šie būtini paketai bus pašalinti.\n"
+"Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu atnaujinti, %lu naujai įdiegti, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu įdiegti iš naujo, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu pasendinti, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[T/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[t/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "T"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Atnaujinimo komandai argumentų nereikia"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: apt-private/private-install.cc:159
-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"
+#: apt-private/private-install.cc:147
+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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Reikia parsiųsti %sB/%sB archyvų.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Reikia parsiųsti %sB archyvų.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s nėra pakankamai laisvos vietos."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Taip, daryk kaip liepiu!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1070,19 +1329,19 @@ msgstr ""
 "Jei norite tęsti, įveskite frazę „%s“\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Nutraukti."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Ar norite tęsti?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Nepavyko parsiųsti kai kurių failų"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1090,19 +1349,19 @@ msgstr ""
 "Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ "
 "arba pabandykite su parametru --fix-missing?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Nepavyko pataisyti dingusių paketų."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Diegimas nutraukiamas."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1112,15 +1371,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1136,15 +1395,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Ši informacija gali padėti išspręsti šią situaciją:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1154,7 +1413,7 @@ msgid_plural ""
 msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1162,18 +1421,18 @@ msgid_plural ""
 msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
 msgstr[1] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1181,7 +1440,7 @@ msgstr ""
 "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be "
 "nurodytų paketų (arba nurodykite išeitį)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1193,319 +1452,92 @@ msgstr ""
 "leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n"
 "pašalinti iš \"Incoming\" aplanko."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Sugadinti paketai"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Bus įdiegti šie papildomi paketai:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Siūlomi paketai:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Rekomenduojami paketai:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Nepavyko autentikuoti kai kurių paketų"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Įdiegti šiuos paketus be patvirtinimo?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nepavyko parsiųsti %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Šie paketai turi neįdiegtų priklausomybių:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "bet %s yra įdiegtas"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "bet %s bus įdiegtas"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "tačiau jis negali būti įdiegtas"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "bet tai yra virtualus paketas"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "bet jis nėra įdiegtas"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "bet jis nebus įdiegtas"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " arba"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Bus įdiegti šie NAUJI paketai:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Bus PAŠALINTI šie paketai:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Šių paketų atnaujinimas sulaikomas:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Bus atnaujinti šie paketai:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Bus pakeisti šie sulaikyti paketai:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (dėl %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"Įspėjimas: Šie būtini paketai bus pašalinti.\n"
-"Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu atnaujinti, %lu naujai įdiegti, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu įdiegti iš naujo, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu pasendinti, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[T/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[t/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "T"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Taisomos priklausomybės..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " nepavyko."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Nepavyko patenkinti priklausomybių"
-
-#: apt-private/private-cachefile.cc:96
-#, fuzzy
-msgid "Unable to minimize the upgrade set"
-msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Įvykdyta"
-
-#: apt-private/private-cachefile.cc:102
-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."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Atnaujinimo komandai argumentų nereikia"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Skaičiuojami atnaujinimai... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Įvykdyta"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Nepavyko pervadinti %s į %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Imamas "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Gauti:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ignoruotas "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Klaida "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Parsiųsta %sB iš %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Vykdoma]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1518,19 +1550,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nepavyko perskaityti %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nepavyko pakeisti į %s"
@@ -1559,11 +1591,11 @@ msgstr "Nepavyko atverti failo %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Nepavyko subprocesui sukurti IPC gijos"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr ""
 
@@ -1607,1766 +1639,1767 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sujungiama turima informaija"
 
-#: cmdline/apt-extracttemplates.cc:224
-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"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
-"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
-"\n"
-"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų "
-"informacijos išskleidimui\n"
-"iš debian paketų\n"
-"\n"
-"Parametrai:\n"
-"  -h Šis pagalbos tekstas\n"
-"  -t Nustatyti laikinąjį aplanką\n"
-"  -c=? Nuskaityti šį konfigūracijų failą\n"
-"  -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nepavyko įrašyti į %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Paketo plėtinių sąrašas yra per ilgas"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Error processing directory %s"
-msgstr "Klaida apdorojant aplanką %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Šaltinio plėtinys yra per ilgas"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Klaida įrašant antraštę į turinio failą"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:409
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Error processing contents %s"
-msgstr "Klaida apdorojant turinį %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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"
+msgid "Double add of diversion %s -> %s"
 msgstr ""
-"Naudojimas: apt-ftparchive [parametrai] komanda\n"
-"Komandos: dvejatainių paketų kelias [perrašomasfailas [keliopriešdėlis]]\n"
-"          sources aplankas [perrašomasfailas [kelippriešdėlis]]\n"
-"          contents kelias\n"
-"          release kelias\n"
-"          generate parametras [grupės]\n"
-"          clean parametras\n"
-"\n"
-"apt-ftparchive generuoja indeksų failus, skirtus Debian archyvams. Palaikomi "
-"keli \n"
-"generavimo stiliai, įskaitant nuo pilnai automatizuoto iki funkcinių "
-"pakeitimų\n"
-"skirtų dpkg-scanpackages ir dpkg-scansources\n"
-"\n"
-"apt-ftparchive sugeneruoja paketų failus iš .debs medžio. Paketo failas turi "
-"visus\n"
-"kontrolinius kiekvieno paketo laukus, o taip pat ir MD5 hešą bei failų "
-"dydžius. Perrašomasis\n"
-"failas palaikomas tam, kad būtų priverstinai nustatytos Pirmenybių bei "
-"Sekcijų reikšmės.\n"
-"\n"
-"Panašiai apt-ftparchive sugeneruoja ir Išeities failus iš .dscs medžio.\n"
-"--source-override nuostata gali būti naudojama nustatant išeities "
-"perrašomąjį failą\n"
-"\n"
-"\"Paketų\" bei \"Išeičių\" komandos turėtų būti paleistos failų medžio "
-"šaknyje. BinaryPath turėtų\n"
-"nurodyti kelią į rekursinės paieškos pagrindą bei perrašytas failas turėtų "
-"turėti perrašymo žymes.\n"
-"Keliopriešdėlis tai yra prirašomas prie failo vardų laikų jei tokių yra. "
-"Vartosenos pavyzdys\n"
-"naudojant Debian archyvą:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Nuostatos:\n"
-"  -h Šis pagalbos tekstas\n"
-"  --md5 Valdyti MD5 generavimą\n"
-"  -s=? Šaltinio perrašomas failas\n"
-"  -q Tylėti\n"
-"  -d=? Pasirinkti papildomą kešo duomenų bazę\n"
-"  --no-delink Įjungti atjungiamąjį derinimo rėžimą\n"
-"  -c=? Perskaityti šį nuostatų failą\n"
-"  -o=? Nustatyti savarankišką konfigūracijos nuostatą"
 
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Nėra atitikmenų"
-
-#: ftparchive/apt-ftparchive.cc:881
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Kai kurių failų nėra paketų grupėje „%s“"
+msgid "Duplicate conf file %s/%s"
+msgstr ""
 
-#: ftparchive/cachedb.cc:47
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old"
+msgid "The path %s is too long"
+msgstr "Kelias %s per ilgas"
 
-#: ftparchive/cachedb.cc:65
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s"
-
-#: ftparchive/cachedb.cc:76
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+msgid "Unpacking %s more than once"
 msgstr ""
-"Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės "
-"versijos, prašome pašalinkite ir perkurkite duomenų bazę."
 
-#: ftparchive/cachedb.cc:81
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nepavyko atverti DB failo %s: %s"
+msgid "The directory %s is diverted"
+msgstr ""
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "Failed to stat %s"
-msgstr "Nepavyko patikrinti %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
 msgstr ""
 
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "Į: Nepavyko perskaityti aplanko %s\n"
-
-#: ftparchive/writer.cc:87
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "Į: Nepavyko patikrinti %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "K: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "Į: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "K: Klaidos failui "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Nepavyko išspręsti %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Judesys medyje nepavyko"
+msgid "Failed to stat %s"
+msgstr "Nepavyko patikrinti %s"
 
-#: ftparchive/writer.cc:210
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
 #, c-format
-msgid "Failed to open %s"
-msgstr "Nepavyko atverti %s"
+msgid "Failed to rename %s to %s"
+msgstr "Nepavyko pervadinti %s į %s"
 
-#: ftparchive/writer.cc:269
+#: apt-inst/extract.cc:249
 #, c-format
-msgid " DeLink %s [%s]\n"
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Nepavyko nuskaityti nuorodos %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Nepavyko atsieti nuorodos %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Nepavyko susieti %s su %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Archyvas neturėjo paketo lauko"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s neturi perrašymo įrašo\n"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Kelias per ilgas"
 
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s prižiūrėtojas yra %s, o ne %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr ""
 
-#: ftparchive/writer.cc:712
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: ftparchive/writer.cc:716
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "Unable to stat %s"
 msgstr ""
 
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nepavyko išskirti atminties"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Unable to open %s"
-msgstr "Nepavyko atverti %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
+msgid "Failed to write file %s"
+msgstr ""
 
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
+#: apt-inst/dirstream.cc:105
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nepavyko nuskaityti perrašymo failo %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3"
+msgid "Failed to close file %s"
+msgstr ""
 
-#: ftparchive/multicompress.cc:71
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Nežinomas suspaudimo algoritmas „%s“"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#: ftparchive/multicompress.cc:101
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Suspaustai išvesčiai %s reikia suspaudimo rinkinio"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Nepavyko sukurti FILE*"
+msgid "Internal error, could not locate member %s"
+msgstr "Vidinė klaida, nepavyko aptikti nario %s"
 
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
 msgstr ""
 
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
 msgstr ""
 
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Vidinė klaida, nepavyko sukurti  %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Nepavyko Nusk/Įraš į subprocesą/failą"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Skaitymo klaida skaičiuojant MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
 msgstr ""
 
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Nepavyko pervadinti %s į %s"
+msgid "Invalid archive member header %s"
+msgstr ""
 
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
 msgstr ""
-"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
-"\n"
-"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų "
-"informacijos išskleidimui\n"
-"iš debian paketų\n"
-"\n"
-"Parametrai:\n"
-"  -h Šis pagalbos tekstas\n"
-"  -t Nustatyti laikinąjį aplanką\n"
-"  -c=? Nuskaityti šį konfigūracijų failą\n"
-"  -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Nežinomas paketo įrašas!"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Archyvas per trumpas"
 
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Naudojimas: apt-sortpkgs [parametrai] byla1 [byla2 ...]\n"
-"\n"
-"apt-sortpkgs - tai paprastas įrankis skirtas paketų rūšiavimui. -s nuostata "
-"naudojama\n"
-"norint nusakyti bylos tipą.\n"
-"\n"
-"Parametrai:\n"
-"  -h Šis pagalbos tekstas\n"
-"  -s Naudoti išeities kodo bylos rūšiavimą\n"
-"  -c=? Nuskaityti šią konfigūracijos bylą\n"
-"  -o=? Nurodyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Nepavyko perskaityti archyvo antraščių"
 
-#: apt-inst/contrib/extracttar.cc:122
+#: apt-inst/contrib/extracttar.cc:124
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:149
+#: apt-inst/contrib/extracttar.cc:151
 msgid "Failed to exec gzip "
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
 msgid "Corrupted archive"
 msgstr "Sugadintas archyvas"
 
-#: apt-inst/contrib/extracttar.cc:201
+#: apt-inst/contrib/extracttar.cc:203
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas"
 
-#: apt-inst/contrib/extracttar.cc:306
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Nežinomas TAR antraštės tipas %u. narys %s"
 
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:94
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
+msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Archyvas per trumpas"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Nepavyko perskaityti archyvo antraščių"
-
-#: apt-inst/filelist.cc:382
-msgid "DropNode called on still linked node"
+#: apt-pkg/install-progress.cc:57
+#, c-format
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-inst/filelist.cc:414
-msgid "Failed to locate the hash element!"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-inst/filelist.cc:461
-msgid "Failed to allocate diversion"
+#: apt-pkg/init.cc:146
+#, c-format
+msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-inst/filelist.cc:466
-msgid "Internal error in AddDiversion"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-inst/filelist.cc:479
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:508
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Double add of diversion %s -> %s"
+msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:551
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Duplicate conf file %s/%s"
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Failed to write file %s"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-inst/dirstream.cc:106
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Failed to close file %s"
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
-#, c-format
-msgid "The path %s is too long"
-msgstr "Kelias %s per ilgas"
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Maišos sumos nesutapimas"
 
-#: apt-inst/extract.cc:125
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Unpacking %s more than once"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-inst/extract.cc:135
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
+
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "The directory %s is diverted"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-inst/extract.cc:145
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr ""
+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-inst/extract.cc:155 apt-inst/extract.cc:299
-msgid "The diversion path is too long"
-msgstr ""
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Nepavyko perskaityti arba atverti paketų sąrašo arba būklės failo."
 
-#: apt-inst/extract.cc:242
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
+"Greičiausiai norėsite paleisti „apt-get update“, kad šios problemos būtų "
+"ištaisytos"
 
-#: apt-inst/extract.cc:282
-msgid "Failed to locate node in its hash bucket"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Nepavyko perskaityti šaltinių sąrašo."
+
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
 msgstr ""
 
-#: apt-inst/extract.cc:286
-msgid "The path is too long"
-msgstr "Kelias per ilgas"
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
+msgstr ""
 
-#: apt-inst/extract.cc:414
-#, c-format
-msgid "Overwrite package match with no version for %s"
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-inst/extract.cc:431
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-inst/extract.cc:491
+#: apt-pkg/pkgcache.cc:174
 #, c-format
-msgid "Unable to stat %s"
+msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:124
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Vidinė klaida, nepavyko aptikti nario %s"
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Priklauso"
 
-#: apt-inst/deb/debfile.cc:219
-msgid "Unparsable control file"
-msgstr ""
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Priešpriklauso"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr ""
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Siūlo"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Rekomenduoja"
 
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
+msgstr "Konfliktuoja"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Nepavyko atverti %s"
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Pakeičia"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Nepavyko pakeisti į %s"
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Pakeičia"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
+msgstr "Sugadina"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Nepavyko patikrinti %s"
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "Svarbu"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "privaloma"
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standartinis"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "nebūtinas"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "papildomas"
+
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "%lid %lih %limin %lis"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
-#, c-format
-msgid "%lih %limin %lis"
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Klaida apdorojant turinį %s"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:617
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
-msgid "Opening configuration file %s"
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
+msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Skaitomi paketų sąrašai"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:821
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
 #, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
+msgid "Unable to write to %s"
+msgstr "Nepavyko įrašyti į %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
+msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Klaida!"
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Maišos sumos nesutapimas"
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Baigta"
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Neatitinka dydžiai"
 
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Klaidingas veiksmas %s"
+
+#: apt-pkg/acquire-item.cc:1579
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Baigta"
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Nepavyko atverti DB failo %s: %s"
 
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
+#: apt-pkg/acquire-item.cc:1637
+msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
-msgid "Command line option %s is not understood"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
-msgid "Command line option %s is not boolean"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Parametrui %s reikia argumento."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid ""
+"An error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:273
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr ""
+msgid "GPG error: %s: %s"
+msgstr "GPG klaida: %s: %s"
 
-#: apt-pkg/contrib/cmndline.cc:304
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
-msgid "Option '%s' is too long"
+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/contrib/cmndline.cc:336
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
-msgid "Sense %s is not understood, try true or false."
+msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Klaidingas veiksmas %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
-msgid "Unable to stat the mount point %s"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Klaida užveriant failą"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
+msgid "List directory %spartial is missing."
+msgstr "Trūksta aplanko „%s“"
 
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Nepavyko atverti rakinimo failo %s"
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "Trūksta aplanko „%s“"
 
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Nepavyko užrakinti sąrašo aplanko"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Could not get lock %s"
-msgstr "Nepavyko rezervuoti rakinimo failo %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Parsiunčiamas %li failas iš %li (liko %s)"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgid "Retrieving file %li of %li"
+msgstr "Parsiunčiamas %li failas iš %li"
 
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
+"Kai kurių indeksų failų nepavyko parsiųsti, jie buvo ignoruoti arba vietoje "
+"jų panaudoti seni."
 
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/policy.cc:422
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Procesas %s gavo segmentavimo klaidą"
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Procesas %s gavo segmentavimo klaidą"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Procesas %s grąžino klaidos kodą (%u)"
+msgid "Did not understand pin type %s"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Procesas %s netikėtai išėjo"
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
 #, c-format
-msgid "Could not open file %s"
-msgstr "Nepavyko atverti failo %s"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Could not open file descriptor %d"
+msgid "Could not configure '%s'. "
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Nepavyko sukurti subproceso IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Nepavyko paleisti suspaudėjo "
-
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "read, still have %llu to read but none left"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
-msgid "write, still have %llu to write but couldn't"
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Klaida užveriant failą"
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Atjungiamas CD-ROM...\n"
 
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Klaida sinchronizuojant failą"
+#: apt-pkg/cdrom.cc:586
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Naudojama CD-ROM prijungimo vieta %s\n"
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Klaida užveriant failą"
+#: apt-pkg/cdrom.cc:599
+msgid "Waiting for disc...\n"
+msgstr "Laukiama disko...\n"
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Klaida sinchronizuojant failą"
+#: apt-pkg/cdrom.cc:609
+msgid "Mounting CD-ROM...\n"
+msgstr "Prijungiamas CD-ROM...\n"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Diegimas nutraukiamas."
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "Identifikuojama... "
 
-#: apt-pkg/pkgcache.cc:148
-msgid "Empty package cache"
+#: apt-pkg/cdrom.cc:662
+#, c-format
+msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:154
-msgid "The package cache file is corrupted"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:159
-msgid "The package cache file is an incompatible version"
+#: apt-pkg/cdrom.cc:734
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:162
-msgid "The package cache file is corrupted, it is too small"
+#: apt-pkg/cdrom.cc:744
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/cdrom.cc:771
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr ""
+msgid "Found label '%s'\n"
+msgstr "Rasta žymė „%s“\n"
 
-#: apt-pkg/pkgcache.cc:172
-msgid "The package cache was built for a different architecture"
+#: apt-pkg/cdrom.cc:800
+msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:314
-msgid "Depends"
-msgstr "Priklauso"
-
-#: apt-pkg/pkgcache.cc:314
-msgid "PreDepends"
-msgstr "Priešpriklauso"
-
-#: apt-pkg/pkgcache.cc:314
-msgid "Suggests"
-msgstr "Siūlo"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Recommends"
-msgstr "Rekomenduoja"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Conflicts"
-msgstr "Konfliktuoja"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Replaces"
-msgstr "Pakeičia"
+#: apt-pkg/cdrom.cc:817
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"Šio disko pavadinimas: \n"
+"„%s“\n"
 
-#: apt-pkg/pkgcache.cc:316
-msgid "Obsoletes"
-msgstr "Pakeičia"
+#: apt-pkg/cdrom.cc:819
+msgid "Copying package lists..."
+msgstr "Kopijuojami paketų sąrašai..."
 
-#: apt-pkg/pkgcache.cc:316
-msgid "Breaks"
-msgstr "Sugadina"
+#: apt-pkg/cdrom.cc:863
+msgid "Writing new source list\n"
+msgstr "Rašomas naujas šaltinių sąrašas\n"
 
-#: apt-pkg/pkgcache.cc:316
-msgid "Enhances"
+#: apt-pkg/cdrom.cc:874
+msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
-msgid "important"
-msgstr "Svarbu"
-
-#: apt-pkg/pkgcache.cc:327
-msgid "required"
-msgstr "privaloma"
-
-#: apt-pkg/pkgcache.cc:327
-msgid "standard"
-msgstr "standartinis"
+#: apt-pkg/algorithms.cc:265
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:328
-msgid "optional"
-msgstr "nebūtinas"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:328
-msgid "extra"
-msgstr "papildomas"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
 msgid "Building dependency tree"
 msgstr "Konstruojamas priklausomybių medis"
 
-#: apt-pkg/depcache.cc:133
+#: apt-pkg/depcache.cc:139
 msgid "Candidate versions"
 msgstr "Galimos versijos"
 
-#: apt-pkg/depcache.cc:162
+#: apt-pkg/depcache.cc:168
 msgid "Dependency generation"
 msgstr "Priklausomybių generavimas"
 
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
 msgid "Reading state information"
 msgstr "Skaitoma būsenos informacija"
 
-#: apt-pkg/depcache.cc:244
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/depcache.cc:256
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:138
+#: apt-pkg/tagfile.cc:140
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:235
+#: apt-pkg/tagfile.cc:237
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:118
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Nepavyko rasti užduoties %s"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nepavyko rasti paketo %s"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nepavyko rasti paketo %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
+
+#: apt-pkg/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:161
+#: apt-pkg/sourcelist.cc:170
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:173
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:175
+#: apt-pkg/sourcelist.cc:184
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:181
+#: apt-pkg/sourcelist.cc:190
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/sourcelist.cc:193
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:197
+#: apt-pkg/sourcelist.cc:206
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:208
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:211
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:217
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:215
+#: apt-pkg/sourcelist.cc:224
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:326
+#: apt-pkg/sourcelist.cc:335
 #, c-format
 msgid "Opening %s"
 msgstr "Atveriama %s"
 
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:362
+#: apt-pkg/sourcelist.cc:371
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:366
+#: apt-pkg/sourcelist.cc:375
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:407
+#: apt-pkg/sourcelist.cc:416
 #, c-format
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
+#: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nepavyko atverti failo %s"
+msgid "Installing %s"
+msgstr "Įdiegta %s"
 
-#: apt-pkg/packagemanager.cc:570
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, 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 ""
+msgid "Configuring %s"
+msgstr "Konfigūruojamas %s"
 
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
+msgid "Removing %s"
+msgstr "Šalinamas %s"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Visiškai pašalintas %s"
 
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
+#: apt-pkg/deb/dpkgpm.cc:99
+#, c-format
+msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
+#: apt-pkg/deb/dpkgpm.cc:100
+#, c-format
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:827
+#, c-format
+msgid "Directory '%s' missing"
 msgstr "Trūksta aplanko „%s“"
 
-#: apt-pkg/acquire.cc:85
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Trūksta aplanko „%s“"
+msgid "Could not open file '%s'"
+msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nepavyko užrakinti sąrašo aplanko"
+#: apt-pkg/deb/dpkgpm.cc:989
+#, c-format
+msgid "Preparing %s"
+msgstr "Ruošiamas %s"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Parsiunčiamas %li failas iš %li (liko %s)"
+msgid "Unpacking %s"
+msgstr "Išpakuojamas %s"
 
-#: apt-pkg/acquire.cc:895
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Parsiunčiamas %li failas iš %li"
+msgid "Preparing to configure %s"
+msgstr "Ruošiamasi konfigūruoti %s"
 
-#: apt-pkg/acquire-worker.cc:113
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
+msgid "Installed %s"
+msgstr "Įdiegta %s"
 
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Ruošiamasi %s pašalinimui"
 
-#: apt-pkg/acquire-worker.cc:166
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
+msgid "Removed %s"
+msgstr "Pašalintas %s"
 
-#: apt-pkg/acquire-worker.cc:452
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, 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."
+msgid "Preparing to completely remove %s"
+msgstr "Ruošiamasi visiškai pašalinti %s"
 
-#: apt-pkg/init.cc:143
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
-msgid "Packaging system '%s' is not supported"
+msgid "Completely removed %s"
+msgstr "Visiškai pašalintas %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1066
+msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Nepavyko įrašyti į %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1069
+msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
+#: apt-pkg/deb/dpkgpm.cc:1090
+msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
+#: apt-pkg/deb/dpkgpm.cc:1568
+msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Nepavyko perskaityti arba atverti paketų sąrašo arba būklės failo."
+#: apt-pkg/deb/dpkgpm.cc:1630
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1635
+msgid "dependency problems - leaving unconfigured"
 msgstr ""
-"Greičiausiai norėsite paleisti „apt-get update“, kad šios problemos būtų "
-"ištaisytos"
 
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Nepavyko perskaityti šaltinių sąrašo."
+#: apt-pkg/deb/dpkgpm.cc:1637
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: apt-pkg/policy.cc:75
-#, c-format
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"No apport report written because the error message indicates a disk full "
+"error"
 msgstr ""
 
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+#: apt-pkg/deb/dpkgpm.cc:1650
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
 msgstr ""
 
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
 msgstr ""
 
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
+#: apt-pkg/deb/dpkgpm.cc:1684
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:87
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Klaida apdorojant turinį %s"
-
-#: apt-pkg/pkgcachegen.cc:251
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nepavyko užrakinti sąrašo aplanko"
 
-#: apt-pkg/pkgcachegen.cc:254
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:570
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1199
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
-msgid "Reading package lists"
-msgstr "Skaitomi paketų sąrašai"
-
-#: apt-pkg/pkgcachegen.cc:1304
-msgid "Collecting File Provides"
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
-msgid "IO Error saving source cache"
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/contrib/fileutl.cc:190
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
+msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:154
-msgid "Hash Sum mismatch"
-msgstr "Maišos sumos nesutapimas"
-
-#: apt-pkg/acquire-item.cc:159
-msgid "Size mismatch"
-msgstr "Neatitinka dydžiai"
-
-#: apt-pkg/acquire-item.cc:164
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Klaidingas veiksmas %s"
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Nepavyko atverti rakinimo failo %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/contrib/fileutl.cc:218
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Nepavyko atverti DB failo %s: %s"
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Nepavyko rezervuoti rakinimo failo %s"
 
-#: apt-pkg/acquire-item.cc:1628
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/contrib/fileutl.cc:394
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/contrib/fileutl.cc:412
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/contrib/fileutl.cc:421
 #, c-format
 msgid ""
-"An error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/contrib/fileutl.cc:824
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG klaida: %s: %s"
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Procesas %s gavo segmentavimo klaidą"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Procesas %s gavo segmentavimo klaidą"
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
 #, 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 ""
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Procesas %s grąžino klaidos kodą (%u)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Procesas %s netikėtai išėjo"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Klaida užveriant failą"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Nepavyko atverti failo %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nepavyko atverti failo %s"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Nepavyko sukurti subproceso IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Nepavyko paleisti suspaudėjo "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/contrib/fileutl.cc:1913
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nepavyko atverti DB failo %s: %s"
+msgid "Problem closing the file %s"
+msgstr "Klaida užveriant failą"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/contrib/fileutl.cc:1925
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Pastaba: pažymimas %s vietoje %s\n"
+msgid "Problem renaming the file %s to %s"
+msgstr "Klaida sinchronizuojant failą"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Klaida užveriant failą"
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Klaida sinchronizuojant failą"
+
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "%c%s... Error!"
+msgstr "%c%s... Klaida!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Baigta"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Pastaba: pažymimas %s vietoje %s\n"
+msgid "%c%s... %u%%"
+msgstr "%c%s... Baigta"
 
-#: apt-pkg/indexrecords.cc:144
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Nepavyko atverti DB failo %s: %s"
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr ""
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/contrib/mmap.cc:111
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
+msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/contrib/mmap.cc:119
 #, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr "Naudojama CD-ROM prijungimo vieta %s\n"
-
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Atjungiamas CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
-msgid "Waiting for disc...\n"
-msgstr "Laukiama disko...\n"
+msgid "Couldn't make mmap of %llu bytes"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:597
-msgid "Mounting CD-ROM...\n"
-msgstr "Prijungiamas CD-ROM...\n"
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Nepavyko atverti %s"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "Identifikuojama.. "
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Nepavyko pakeisti į %s"
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/contrib/mmap.cc:290
 #, c-format
-msgid "Stored label: %s\n"
+msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Atjungiamas CD-ROM...\n"
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Nepavyko patikrinti %s"
 
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/contrib/mmap.cc:446
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/contrib/mmap.cc:449
 msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Found label '%s'\n"
-msgstr "Rasta žymė „%s“\n"
+msgid "Unable to stat the mount point %s"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:784
-msgid "That is not a valid name, try again.\n"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
+msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
-"Šio disko pavadinimas: \n"
-"„%s“\n"
 
-#: apt-pkg/cdrom.cc:803
-msgid "Copying package lists..."
-msgstr "Kopijuojami paketų sąrašai..."
-
-#: apt-pkg/cdrom.cc:838
-msgid "Writing new source list\n"
-msgstr "Rašomas naujas šaltinių sąrašas\n"
-
-#: apt-pkg/cdrom.cc:846
-msgid "Source list entries for this disc are:\n"
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Wrote %i records.\n"
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Maišos sumos nesutapimas"
-
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
+msgid "Syntax error %s:%u: Included from here"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:593
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nepavyko rasti užduoties %s"
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:599
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nepavyko rasti paketo %s"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:605
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Nepavyko rasti paketo %s"
+msgid "No keyring installed in %s."
+msgstr "Diegimas nutraukiamas."
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Option %s requires an argument."
+msgstr "Parametrui %s reikia argumento."
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Klaidingas veiksmas %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
+"\n"
+"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų "
+"informacijos išskleidimui\n"
+"iš debian paketų\n"
+"\n"
+"Parametrai:\n"
+"  -h Šis pagalbos tekstas\n"
+"  -t Nustatyti laikinąjį aplanką\n"
+"  -c=? Nuskaityti šį konfigūracijų failą\n"
+"  -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:51
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nepavyko sukurti %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Paketo plėtinių sąrašas yra per ilgas"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Error processing directory %s"
+msgstr "Klaida apdorojant aplanką %s"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Šaltinio plėtinys yra per ilgas"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Klaida įrašant antraštę į turinio failą"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Klaida apdorojant turinį %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Naudojimas: apt-ftparchive [parametrai] komanda\n"
+"Komandos: dvejatainių paketų kelias [perrašomasfailas [keliopriešdėlis]]\n"
+"          sources aplankas [perrašomasfailas [kelippriešdėlis]]\n"
+"          contents kelias\n"
+"          release kelias\n"
+"          generate parametras [grupės]\n"
+"          clean parametras\n"
+"\n"
+"apt-ftparchive generuoja indeksų failus, skirtus Debian archyvams. Palaikomi "
+"keli \n"
+"generavimo stiliai, įskaitant nuo pilnai automatizuoto iki funkcinių "
+"pakeitimų\n"
+"skirtų dpkg-scanpackages ir dpkg-scansources\n"
+"\n"
+"apt-ftparchive sugeneruoja paketų failus iš .debs medžio. Paketo failas turi "
+"visus\n"
+"kontrolinius kiekvieno paketo laukus, o taip pat ir MD5 hešą bei failų "
+"dydžius. Perrašomasis\n"
+"failas palaikomas tam, kad būtų priverstinai nustatytos Pirmenybių bei "
+"Sekcijų reikšmės.\n"
+"\n"
+"Panašiai apt-ftparchive sugeneruoja ir Išeities failus iš .dscs medžio.\n"
+"--source-override nuostata gali būti naudojama nustatant išeities "
+"perrašomąjį failą\n"
+"\n"
+"\"Paketų\" bei \"Išeičių\" komandos turėtų būti paleistos failų medžio "
+"šaknyje. BinaryPath turėtų\n"
+"nurodyti kelią į rekursinės paieškos pagrindą bei perrašytas failas turėtų "
+"turėti perrašymo žymes.\n"
+"Keliopriešdėlis tai yra prirašomas prie failo vardų laikų jei tokių yra. "
+"Vartosenos pavyzdys\n"
+"naudojant Debian archyvą:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Nuostatos:\n"
+"  -h Šis pagalbos tekstas\n"
+"  --md5 Valdyti MD5 generavimą\n"
+"  -s=? Šaltinio perrašomas failas\n"
+"  -q Tylėti\n"
+"  -d=? Pasirinkti papildomą kešo duomenų bazę\n"
+"  --no-delink Įjungti atjungiamąjį derinimo rėžimą\n"
+"  -c=? Perskaityti šį nuostatų failą\n"
+"  -o=? Nustatyti savarankišką konfigūracijos nuostatą"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Nėra atitikmenų"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Kai kurių failų nėra paketų grupėje „%s“"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
+#: ftparchive/cachedb.cc:80
 #, fuzzy
 msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
-"Kai kurių indeksų failų nepavyko parsiųsti, jie buvo ignoruoti arba vietoje "
-"jų panaudoti seni."
+"Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės "
+"versijos, prašome pašalinkite ir perkurkite duomenų bazę."
 
-#: apt-pkg/deb/dpkgpm.cc:91
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "Įdiegta %s"
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr ""
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/writer.cc:91
 #, c-format
-msgid "Configuring %s"
-msgstr "Konfigūruojamas %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "Į: Nepavyko perskaityti aplanko %s\n"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: ftparchive/writer.cc:96
 #, c-format
-msgid "Removing %s"
-msgstr "Šalinamas %s"
+msgid "W: Unable to stat %s\n"
+msgstr "Į: Nepavyko patikrinti %s\n"
 
-#: apt-pkg/deb/dpkgpm.cc:94
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Visiškai pašalintas %s"
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "K: "
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "Į: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "K: Klaidos failui "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
 #, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "Failed to resolve %s"
+msgstr "Nepavyko išspręsti %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Judesys medyje nepavyko"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: ftparchive/writer.cc:219
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "Failed to open %s"
+msgstr "Nepavyko atverti %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: ftparchive/writer.cc:286
 #, c-format
-msgid "Directory '%s' missing"
-msgstr "Trūksta aplanko „%s“"
+msgid "Failed to readlink %s"
+msgstr "Nepavyko nuskaityti nuorodos %s"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Nepavyko atverti failo %s"
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Nepavyko atsieti nuorodos %s"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: ftparchive/writer.cc:298
 #, c-format
-msgid "Preparing %s"
-msgstr "Ruošiamas %s"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Nepavyko susieti %s su %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: ftparchive/writer.cc:308
 #, c-format
-msgid "Unpacking %s"
-msgstr "Išpakuojamas %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Archyvas neturėjo paketo lauko"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
 #, c-format
-msgid "Preparing to configure %s"
-msgstr "Ruošiamasi konfigūruoti %s"
+msgid "  %s has no override entry\n"
+msgstr "  %s neturi perrašymo įrašo\n"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
 #, c-format
-msgid "Installed %s"
-msgstr "Įdiegta %s"
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s prižiūrėtojas yra %s, o ne %s\n"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: ftparchive/writer.cc:721
 #, c-format
-msgid "Preparing for removal of %s"
-msgstr "Ruošiamasi %s pašalinimui"
+msgid "  %s has no source override entry\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: ftparchive/writer.cc:725
 #, c-format
-msgid "Removed %s"
-msgstr "Pašalintas %s"
+msgid "  %s has no binary override entry either\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Nepavyko išskirti atminties"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Ruošiamasi visiškai pašalinti %s"
+msgid "Unable to open %s"
+msgstr "Nepavyko atverti %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
-msgid "Completely removed %s"
-msgstr "Visiškai pašalintas %s"
+msgid "Failed to read the override file %s"
+msgstr "Nepavyko nuskaityti perrašymo failo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: ftparchive/override.cc:178
 #, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Nepavyko įrašyti į %s"
+msgid "Malformed override %s line %llu #2"
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
-msgid "Is /dev/pts mounted?"
-msgstr ""
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3"
 
-#: apt-pkg/deb/dpkgpm.cc:1070
-msgid "Is stdout a terminal?"
-msgstr ""
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Nežinomas suspaudimo algoritmas „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:1558
-msgid "Operation was interrupted before it could finish"
-msgstr ""
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Suspaustai išvesčiai %s reikia suspaudimo rinkinio"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Nepavyko sukurti FILE*"
 
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
-msgid "dependency problems - leaving unconfigured"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Vidinė klaida, nepavyko sukurti  %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Nepavyko Nusk/Įraš į subprocesą/failą"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Skaitymo klaida skaičiuojant MD5"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
-#, c-format
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
 msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
+"\n"
+"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų "
+"informacijos išskleidimui\n"
+"iš debian paketų\n"
+"\n"
+"Parametrai:\n"
+"  -h Šis pagalbos tekstas\n"
+"  -t Nustatyti laikinąjį aplanką\n"
+"  -c=? Nuskaityti šį konfigūracijų failą\n"
+"  -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
-#: apt-pkg/deb/debsystem.cc:87
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Nepavyko užrakinti sąrašo aplanko"
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Nežinomas paketo įrašas!"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
-#, c-format
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:121
-msgid "Not locked"
+"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 ""
+"Naudojimas: apt-sortpkgs [parametrai] byla1 [byla2 ...]\n"
+"\n"
+"apt-sortpkgs - tai paprastas įrankis skirtas paketų rūšiavimui. -s nuostata "
+"naudojama\n"
+"norint nusakyti bylos tipą.\n"
+"\n"
+"Parametrai:\n"
+"  -h Šis pagalbos tekstas\n"
+"  -s Naudoti išeities kodo bylos rūšiavimą\n"
+"  -c=? Nuskaityti šią konfigūracijos bylą\n"
+"  -o=? Nurodyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s nėra tikras DEB paketas."
@@ -3452,9 +3485,6 @@ msgstr ""
 #~ msgid "Failed to remove %s"
 #~ msgstr "Nepavyko pašalinti %s"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Nepavyko sukurti %s"
-
 #~ msgid "Reading file listing"
 #~ msgstr "Skaitomas failų sąrašas"
 
diff --git a/po/mr.po b/po/mr.po
index 2b4d3103f..e1fef1a2e 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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 "
@@ -16,154 +16,155 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "पॅकेज %s आवृती %s मध्ये एक अनोळखी डीईपी:आहे\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "पॅकेजची सर्व नांवे: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "पॅकेजची सर्व नांवे: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr " सामान्य पॅकेजेस्: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr " शुध्द आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr " एकमेव आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "मिश्रित आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr " हरवलेले/गहाळ: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "एकूण स्पष्ट आवृत्या: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "एकूण स्पष्ट विवरणे: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "एकूण निर्भरता:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "एकूण व्हीईआर/संचिका परस्पर संबंध:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "एकूण विव/संचिका परस्पर संबंध:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "एकूण मॅपींगस् तरतूद: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "एकूण एकत्रित अक्षरसंच:"
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "एकूण परावलंबित आवृत्ती अवकाश:"
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "एकूण दुर्लक्षित अवकाश:"
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):"
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत"
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "पॅकेजेस सापडले नाहीत"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "तुम्हाला फक्त एकच नमुना द्यावा लागेल"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "पॅकेज %s शोधण्यास असमर्थ आहे"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "पॅकेज संचिका:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "दृतिका सिंक नाही,पॅकेज संचिका क्ष-संदर्भ करता येत नाही"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "एकत्रित पॅकेजेस:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(मिळाले नाही)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "अधिष्ठापित केले:"
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "उमेदवार:"
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(कोणताच नाही)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "पॅकेज (पिन):"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "आवृत्ती कोष्टक:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -236,29 +237,29 @@ msgstr ""
 "-o=? एखादा अहेतूक संरचना पर्याय निर्धारित करा उदा --o dir::cache=/tmp\n"
 "अधिक माहितीसाठी apt-cache(8) and apt.conf(5) ची मॅन्युअल पृष्ठे पहा \n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "या तबकडीला कृपया नाव द्या जसे डेबियन २ एलआरएल तबकडी १"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "कृपया तबकडी ड्राईव्हमध्ये ठेवून एंटर दाबा"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "तुमच्या संचामधील सर्व सीडीजसाठी याच कृतीची पुनरावृत्ती करा(हीच कृती करा)"
 
@@ -294,65 +295,65 @@ msgstr ""
 " -c= ?  ही संरचना संचिका वाचा \n"
 " -o=?  एखदा अहेतुक संरचना पर्याय निर्धारित करा, उदा।eg -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे"
@@ -372,114 +373,114 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s मध्ये पुरेशी जागा नाही"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s उगम घ्या\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "चाईल्ड प्रक्रिया अयशस्वी"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, 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:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -488,37 +489,37 @@ msgstr ""
 "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
 "डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) ला जोडत आहे"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -605,53 +606,74 @@ msgstr ""
 " apt.conf(5)  पुस्तिका पाने पहा.\n"
 "         ह्या APT ला सुपर काऊ पॉवर्स आहेत\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "पण ते संस्थापित केले नाही"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s उघडण्यास असमर्थ"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -678,7 +700,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -726,52 +748,52 @@ msgstr "%s मधील सीडी-रॉम अनमाऊंट करण�
 msgid "Disk not found."
 msgstr "डिस्क सापडत नाही"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "फाईल सापडली नाही"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "स्टॅट करण्यास असमर्थ"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "अवैध यू आर एल, स्थानिक यू आर आय एस सुरू होऊ नये यापासून //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "लॉग इन करत आहे"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "पिअर नाव सांगण्यास/सापडण्यास असमर्थ"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "स्थानिक नाव सांगण्यास असमर्थ"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "सर्व्हर ने संबंध जोडण्यास नकार दिला व सांगितले: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "सर्व्हरने %s सांगितले,यूजर असमर्थ:"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "सर्व्हरने %s सांगितले, पास असमर्थ:"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -779,121 +801,123 @@ msgstr ""
 "प्रॉक्सी सर्व्हर निर्देशित केला पण लॉगीन स्क्रिप्ट नाही, प्राप्त केलेले ::ftp:: प्रॉक्सीलॉगीन "
 "निरर्थक आहे."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "सर्व्हरने %s सांगितले, '%s' लॉग इन स्क्रिप्ट आज्ञावली असमर्थ:"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "सर्व्हरने %s सांगितले: टाईप असमर्थ:"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "वेळेअभावी संबंध जोडता येत नाही"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "सर्व्हरने संबंध जोडणी बंद केली"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "त्रुटी वाचा"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "प्रतिसाधाने बफर भरुन गेले."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "प्रोटोकॉल खराब झाले"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "लिहिण्यात त्रुटी"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "सॉकेट तयार करू शकत नाही"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "असमर्थ"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "पॅसिव्ह सॉकेट जोडता येत नाही"
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "गेटऍड्रेसइनफो लिसनिंग सॉकेट घेण्यास असमर्थ होते"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "सॉकेट चिकटवता येत नाही"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "सॉकेट वर ऐकता येत नाही"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "सॉकेटचे नाव सांगता येत नाही"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "पोर्ट आज्ञा पाठवता येत नाही/पोर्ट आज्ञा  पाठविण्यास असमर्थ"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "माहित नसलेला पत्ता फॅमिली %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "ई.पी.आर.टी. चुकले,सर्व्हरने %s सांगितले"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "डेटा सॉकेट जोडणी वेळेअभावी तुटली"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "जोडणी स्विकारण्यास असमर्थ"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "फाईल हॅश करण्यात त्रुटी"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "सर्व्हरने %s सांगितले, फाईल मिळवण्यास असमर्थ"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "डेटा सॉकेट वेळेअभावी तुटले"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "सर्व्हरने %s सांगितले, डेटा स्थानांतरण चुकले"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "प्रश्न"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "जारी करण्यास करण्यास असमर्थ"
 
@@ -929,7 +953,7 @@ msgstr "%s:%s (%s) ला जोडू शकत नाही"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s ला जोडत आहे"
@@ -959,183 +983,417 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s ला जोडण्यास असमर्थ:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "किमान एक अवैध सही सापडली."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "खालील सह्या अवैध आहेत:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "खालील सह्यांची खात्री करता येत नाही कारण सार्वजनिक कीउपलब्ध नाही:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "सर्व्हर मधून वाचण्यात चूक"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "चुकले/असमर्थ निवड करा"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "जोडणी वेळेअभावी तुटली"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "शीर्षकासाठी थांबले आहे...."
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "वाईट शीर्षक ओळ"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर्व्हरने अवैध प्रत्त्युत्तर शीर्षक पाठविले"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले "
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर्व्हरने अवैध मजकूर-विस्तार शीर्षक पाठविले"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर्व्हरने विस्तार तांत्रिक मदत जोडली"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "अपरिचित दिनांक प्रकार/स्वरूप "
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "चुकीचा शीर्षक डाटा"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "जोडणी अयशस्वी"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "अंतर्गत त्रुटी"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "झाले"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr "अयशस्वी/चूकीचे झाले."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr "झाले"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "पण %s संस्थापित झाले"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "पण %s संस्थापित करायचे आहे"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "पण ते संस्थापित करण्याजोगे नाही"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "पण ते आभासी पॅकेज आहे"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "पण ते संस्थापित केले नाही"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "पण ते संस्थापित होणार नाही"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr "किंवा"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "खालील पॅकेजेस परत ठेवली गेली:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (च्या मुळे %s)"
+
+#: apt-private/private-output.cc:662
+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"
+"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu पुनर्संस्थापित केले,"
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu मागील आवृत्तीकृत केले,"
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "होय"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ    शकत नाही."
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर  संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव्ह अकार्यक्षम केले आहे"
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr "किती विचित्र...आकार जुळत नाहीत, ईमेल apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "अर्काईव्हजच्या %sB/%sB घेण्याची गरज आहे\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "अर्काईव्हज%sB घेण्याची गरज आहे.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "या क्रियेनंतर, %sB एवढी अधिक डिस्क जागा वापरली जाईल.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "हो, मी म्ह्टल्याप्रमाणे करा!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1146,20 +1404,20 @@ msgstr ""
 "पुढे '%s' उक्ती मध्ये लिहिणार \n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "व्यत्यय/बंद करा."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1167,20 +1425,20 @@ msgstr ""
 "काही आर्काइव्हज आणण्यास असमर्थ, कदाचित apt-get रन करुन अद्ययावत करा किंवा --fix- "
 "बरोबर प्रयत्न कराहरवलेले/गहाळ?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "न सापडणारी पॅकेजेस नीट करण्यास असमर्थ."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "संस्थापन खंडित करत आहे."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1190,15 +1448,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1216,15 +1474,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1234,7 +1492,7 @@ msgid_plural ""
 msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1242,20 +1500,20 @@ msgid_plural ""
 msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
 msgstr[1] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "तुम्हाला कदाचित 'apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा "
 "लागेल'यात बदल करण्यासाठी:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1263,7 +1521,7 @@ msgstr ""
 "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा "
 "(किंवा पर्याय सांगा)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1275,319 +1533,93 @@ msgstr ""
 "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
 "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "तुटलेली पॅकेजेस"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "सुचवलेली पॅकेजेस:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "शिफारस केलेली पॅकेजेस:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 #, fuzzy
 msgid "Install these packages without verification?"
 msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s आणणे असफल\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "पण %s संस्थापित झाले"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "पण %s संस्थापित करायचे आहे"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "पण ते संस्थापित करण्याजोगे नाही"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "पण ते आभासी पॅकेज आहे"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "पण ते संस्थापित केले नाही"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "पण ते संस्थापित होणार नाही"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr "किंवा"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "खालील पॅकेजेस परत ठेवली गेली:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (च्या मुळे %s)"
-
-#: apt-private/private-output.cc:631
-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"
-"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu पुनर्संस्थापित केले,"
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu मागील आवृत्तीकृत केले,"
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "होय"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr "अयशस्वी/चूकीचे झाले."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr "झाले"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ    शकत नाही."
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "झाले"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "दाबा"
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "मिळवा:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "आय.जी.एन."
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "दोष इ.आर.आर."
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s (%sB/s) मध्ये %sB मिळविला\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr "[काम करत आहे]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1600,19 +1632,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s वाचण्यास असमर्थ"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s मध्ये बदलण्यास असमर्थ"
@@ -1641,11 +1673,11 @@ msgstr "%s फाईल उघडता येत नाही"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "जोडणी अकाली बंद झाली"
 
@@ -1686,1348 +1718,478 @@ msgstr ""
 msgid "Merging available information"
 msgstr "उपलब्ध माहितीचे एकत्रीकरण करत आहे"
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n"
-" \n"
-"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n"
-"डेबियन पॅकेजेस मधून \n"
-"\n"
-"पर्याय : \n"
-" -h    हा साह्याकारी मजकूर \n"
-" -t     टेंप डिर निर्धारित करा \n"
-"  -c=?  ही संरचना संचिका वाचा \n"
-" -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे-  -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s मध्ये लिहिण्यास असमर्थ "
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "पॅकेजेसची विस्तारित यादी खूप मोठी आहे"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s "
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "त्रुटी प्रक्रिया मजकूर %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"वापर:  apt-ftparchive [options] command\n"
-"आज्ञा: 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 डेबियन फाईलसंचासाठी अनुक्रम संचिका निर्माण करतो.तो\n"
-" dpkg-scanpackages व dpkg-scansources करिता निर्मितीच्या संपूर्ण\n"
-" स्वंयंचलित ते कार्यकारी बदलावांपर्यंत अनेक शैलींना पाठबळ देतो\n"
-"\n"
-"apt-ftparchive हा .debsच्या तरुरचनेपासून पॅकेज संचिका निर्माण करतो \n"
-"पॅकेज संचिकेमध्ये प्रत्येक पॅकेज तसेच MD5 हॅश व संचिकाआकारामधील सर्व \n"
-" नियंत्रक क्षेत्रांची माहिती असते.अग्रक्रम आणि विभाग यांच्या मूल्यांचा प्रभाव \n"
-"वाढविण्यासाठी ओव्हरराईड संचिकेला पुष्टि दिलेली असते \n"
-"\n"
-"तसेच apt-ftparchive हा .dscs च्या तरूरचनेपासून उगमस्थान संचिका निर्माण करतो \n"
-"--source-override पर्यायाचा उपयोग एखाद्या src ओव्हरराईड संचिका नेमकेपणाने दाखविण्यास "
-"होतो \n"
-"\n"
-" 'packages' आणि  'sources' आज्ञावली तरूरचनेच्या मुळाशी दिल्या जाव्यात \n"
-"द्वयंक मार्गाचा निर्देश पुनरावर्ती शोधाच्या पाऱ्याकडे केलेला असावा आणि \n"
-" ओव्हरराईड संचिकेमध्ये ओव्हरराईड संकेत (फ्लॅग्ज) असावेत आणि \n"
-" संचिकानामक्षेत्रे असल्यास Pathprefix त्यांना जोडलेले असावेत.\n"
-"डेबियन archiveमधील नमुन्यादाखल उपयोग : \n"
-"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"पर्याय : \n"
-"  -h   हा साह्याकारी मजकूर \n"
-"--md5  MD5  ची निर्मिती नियंत्रित करा \n"
-"  -s=    उगमस्थान ओव्हरराईड संचिका \n"
-" -q     शांत \n"
-"  -d=    पर्यायी दृतिकादायी डेटाबेस निवडा \n"
-" --no-delink दुवा तोडणारा डिबग मार्ग समर्थ करा \n"
-" ---contents  माहिती संचिकेची निर्मिती नियंत्रित करा \n"
-"  -c=?   ही संरचना संचिका वाचा \n"
-"  -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "निवडक भाग जुळत नाही"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB खराब झाली होती, संचिका %s.old म्हणून पुनर्नामांकित केली"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे"
-
-#: ftparchive/cachedb.cc:76
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, "
-"कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा"
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "%s: %s DB संचिका उघडण्यास असमर्थ"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%s स्टेट करण्यास असमर्थ"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "संकेतक घेण्यास असमर्थ"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E:"
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "धो.सू.:"
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "ई: संचिकेला लागू होणाऱ्या चुका"
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s सोडवण्यास असमर्थ"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "ट्री चालणे असमर्थ"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s उघडण्यास असमर्थ"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "%s [%s] डी दुवा\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "%s वाचणारा दुवा असमर्थ"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "%s दुवा काढण्यास असमर्थ"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "%s चा %s दुवा साधण्यास असमर्थ"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "%sB हीट ची डिलींक मर्यादा\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc-स्मरणस्थळ शोधण्यास असमर्थ"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s उघडण्यास असमर्थ"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "%s दुर्लक्षित संचिका वाचण्यास असमर्थ"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "माहित नसलेली/ले संक्षेप पद्धती/अलगोरिथम '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "%s संकलित आऊटपुट/निर्गत साठी संक्षेप संचाची गरज"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "संचिका * तयार करण्यास असमर्थ"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "नविन प्रक्रिया(प्रोसेस) निर्माण करण्यास असमर्थ"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "चॉईल्ड(प्रोसेस)ला संकलित करा"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "IO ची उपक्रिया/संचिका असमर्थ "
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n"
-" \n"
-"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n"
-"डेबियन पॅकेजेस मधून \n"
-"\n"
-"पर्याय : \n"
-" -h    हा साह्याकारी मजकूर \n"
-" -t     टेंप डिर निर्धारित करा \n"
-"  -c=?  ही संरचना संचिका वाचा \n"
-" -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे-  -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "अनोळखी पॅकेज माहिती संच!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"वापर:apt-sortpkgs [पर्याय] फाईल१[फाईल २...]\n"
-"\n"
-" apt-sortpkgs हे पॅकेज फाईल्सचं वर्गीकरण करणारी एक साधी आज्ञावली आहे. -s  पर्याय हा "
-"फाईल\n"
-"कुठल्या प्रकारची आहे हे दाखवण्यासाठी वापरतात.\n"
-"\n"
-"पर्याय\n"
-"   -h     हा मदत मजकूर\n"
-"   -s     उगमस्थान फाईल वापरा\n"
-"   -c=?   ही संरचना फाईल वाचा\n"
-"   -o=?-  अनियंत्रित संरचना पर्याय निश्चित करा,eg -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "पाईप तयार करण्यास असमर्थ"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "exec gzip करण्यास असमर्थ"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "बिघडलेली अर्काईव्हज"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "अयोग्य अर्काईव्ह ओळख सही"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "अर्काईव्ह मेंबर शीर्षक वाचण्यास त्रुटी"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "अर्काईव्ह खूप छोटे आहे"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "अर्काईव्ह शीर्षके वाचणे असफल"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "सुटा करण्यासाठी बोलावलेला/आणलेला सांधा(ड्रापनोड)अजुनही जुळलेलाच सांधा(लिंकनोड) आहे"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "हॅश एलिमेंट शोधूने काढण्यास असमर्थ!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "नेमून दिलेल्यात फेरबदल करण्यास अयशस्वी"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "AddDiversion/ऍड डायव्हर्जन मध्ये आंतरिक दोष"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "डायव्हर्जन पुनः लिहिण्यास प्रयत्न करत आहे,%s -> %s and %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "%s -> %s डायव्हर्जन दुप्पट मिळवा"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "%s/%s संचिरित संचिकाची दुसरी प्रत/नक्कल"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "%s फाईल मध्ये लिहिण्यास असमर्थ"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "%s फाईल बंद करण्यास असमर्थ"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "मार्ग %s हा खूप लांब आहे"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s एकापेक्षा जास्त वेळा उघडत आहे"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "डायव्हर्जन इच्छित %s/%s मध्ये लिहिण्याचा पॅकेज प्रयत्न करत आहे"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "डायव्हर्जन मार्ग हा खूप लांब आहे"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s स्टेट करण्यास असमर्थ"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "%s संचिका ही संचिका नसलेल्या संचिकेबरोबर बदललेली आहे"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "नोडचे त्याच्या हॅश बकेटमध्ये/बादलीत स्थान निश्चित करण्यास असमर्थ"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "मार्ग खूप लांब आहे"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "%s च्या आवृत्तीशी पुनः लिहिलेल्या पॅकेज जुळत नाही"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "File %s/%s, %s पॅकेज मधल्या एका वर पुनर्लिखित होते"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s स्टॅट करण्यास असमर्थ"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "%s फाईल मध्ये लिहिण्यास असमर्थ"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "%s फाईल बंद करण्यास असमर्थ"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "हा वैध DEB अर्काईव्ह नाही,'%s' मेंबर उपलब्ध नाही"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "अंतर्गत त्रुटी,%s मेंबर शोधू शकत नाही"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "अनपार्सेबल नियंत्रण फाईल"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "रिकामी फाईल mmap करता येणार नाही"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "अयोग्य अर्काईव्ह ओळख सही"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "%s साठी पाईप उघडता येत नाही"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "अर्काईव्ह मेंबर शीर्षक वाचण्यास त्रुटी"
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "mmap चे %lu बाईटस् करता येणार नाहीत"
+msgid "Invalid archive member header %s"
+msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "%s उघडण्यास असमर्थ"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "जारी करण्यास करण्यास असमर्थ"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "अर्काईव्ह खूप छोटे आहे"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "mmap चे %lu बाईटस् करता येणार नाहीत"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "अर्काईव्ह शीर्षके वाचणे असफल"
 
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "फाईल छोटी करणे असफल"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "पाईप तयार करण्यास असमर्थ"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "exec gzip करण्यास असमर्थ"
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "बिघडलेली अर्काईव्हज"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "%s स्टॅट करण्यात असमर्थ. "
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%limin %lis"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s निवडक भाग सापडत नाही"
-
-#: apt-pkg/contrib/configuration.cc:503
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "संक्षिप्तरुपाचा माहित नसलेला प्रकार: '%c'"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "%s संरचना फाईल उघडत आहे"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "रचनेच्या नियमांचा दोष %s:%u: ब्लॉक नावाशिवाय सुरू होतो."
-
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "रचनेच्या नियमांचा दोष : %s:%u: मालफॉर्मड् टॅग"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "रचनेच्या नियमांचा दोष %s:%u: मुल्यांच्या नंतर अधिक जंक"
-
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात"
+msgid "Packaging system '%s' is not supported"
+msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "रचनेच्या नियमांचा दोष %s:%u: खूपच एकात एक इनक्लूडस्"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ "
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "रचनेच्या नियमांचा दोष %s:%u: ह्या पासून  समाविष्ट "
+msgid "Wrote %i records.\n"
+msgstr "%i माहितीसंच लिहिले.\n"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "नियम रचनेचा दोष %s:%u: '%s' दिशादर्शक असहाय्यकारी"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच  लिहिले.\n"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "नियम रचनेचा दोष %s:%u: फाईलच्या अंती अधिक जंक"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... चूक/त्रुटी!"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... झाले"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... झाले"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "आदेश रेखा पर्याय '%c' [पासून %s] हे माहित नाही."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "आदेश रेखा पर्याय %s नीट समजला नाही"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "आदेश रेखा पर्याय %s हे बूलियन नाही"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "पर्याय %s साठी ऑर्गुमेंट पाहिजे"
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "पर्याय %s: संरचितेच्या यादीतील कलमांचा तपशीलाला असलेच पाहिजे ते =<मूल्य>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "%s पर्याय ला पूर्णांक ऑर्गुमेंट पाहिजे,'%s' नको"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "'%s' पर्याय खूप लांब आहे"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "%s संवेदना हे समजत नाही, चूक की बरोबर चा प्रयत्न करा."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "%s अवैध क्रिया"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "%s माऊंट पॉईंट स्टॅट करण्यास असमर्थ"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ"
-
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "फाईल बंद करण्यात अडचण"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "%s कुलूप फाईल उघडता येत नाही"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "%s कुलुप मिळवता येत नाही"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgid "Hash mismatch for: %s"
+msgstr "हॅश बेरीज जुळत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
+msgid "The method driver %s could not be found."
+msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे"
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "%s उपक्रिया अचानकपणे बाहेर पडली"
+msgid "Method %s did not start correctly"
+msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Could not open file %s"
-msgstr "%s फाईल उघडता येत नाही"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "%s साठी पाईप उघडता येत नाही"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ"
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "फाईल बंद करण्यात अडचण"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "संचिकेची syncing समस्या"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "फाईल अनलिंकिंग करण्यात अडचण"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "संचिकेची syncing समस्या"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी  apt-get update प्रोग्राम चालू करु शकता"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "संस्थापन खंडित करत आहे."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "उगमांच्या याद्या वाचता येणार नाहीत."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "पॅकेज अस्थाई स्मृतिकोष"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल ही विजोड आवृत्ती आहे"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "'%s' आवृत्तीकरण प्रणालीला हे APT तांत्रिक मदत देऊ शकत नाही"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "पॅकेज अस्थाई स्मृतीकोष वेगळ्या वास्तुविद्ये साठी बनवला गेला"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "अवलंबित"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "पूर्व अवलंबित"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "सुचवणे"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "शिफारस"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "परस्परविरोध"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "परत त्याठिकाणी आणा"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "अप्रचलित"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "तोडले"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "अत्यावश्यक"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "आवश्यक"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "मानक"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "एच्छिक"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "अधिक"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "अवलंबित रचना बांधणी करत आहे"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "कंॅडिडेट आवृत्त्या"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "अवलंबित/विसंबून असलेले उत्पादन "
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "स्थिती माहिती वाचत आहे"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s StateFile उघडणे असफल"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "%s उघडत आहे"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "%s फाईल उघडता येत नाही"
-
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"ह्याचे आधिष्ठापन सुरु करण्यासाठी अत्यावश्यक तात्पुरते काढुन टाकण्याची गरज आहे%s पॅकेज "
-"गुंतागुंतीमुळे/Pre-Depends पूर्व अवलंबित आवर्तन.हे नेहमीच वाईट असते, पण जर तुम्हाला ते खरोखर "
-"करावयाचे असेल तर,APT::Force-LoopBreak पर्याय कार्यान्वित करा."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"दोष,पॅकेज समस्या निवारक::निवारण  करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित  "
-"पॅकेजेस असू शकते."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "संचयिका यादीत %s पार्शल हरवले आहे."
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "ऑर्काइव्ह संचयिका %spartial गायब आहे."
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "%li ची %li(%s राहिलेले) संचिका पुन:प्राप्त करीत आहे"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ "
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s स्टॅट करण्यात असमर्थ. "
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही."
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी  apt-get update प्रोग्राम चालू करु शकता"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "उगमांच्या याद्या वाचता येणार नाहीत."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही "
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "%s पिनचा प्रकार समजलेला नाही"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "अस्थायी स्मृतिकोष मध्ये विसंगत आवृतीकरण प्रणाली आहे"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली "
 "आहे."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा "
 "ओलांडली आहे."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही "
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "पॅकेज याद्या वाचत आहोत"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s मध्ये लिहिण्यास असमर्थ "
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "हॅश बेरीज जुळत नाही"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "आकार जुळतनाही"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "%s अवैध क्रिया"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3035,12 +2197,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3049,12 +2211,12 @@ msgstr ""
 "मी %s पॅकेजकरीता संचिका शोधण्यास  समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
 "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3062,71 +2224,131 @@ msgstr ""
 "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
 "ठिकाण %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "विक्रेता गट %s मध्ये बोटाचे ठसे नाहीत"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
+msgid "List directory %spartial is missing."
+msgstr "संचयिका यादीत %s पार्शल हरवले आहे."
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
+msgid "Archives directory %spartial is missing."
+msgstr "ऑर्काइव्ह संचयिका %spartial गायब आहे."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li ची %li(%s राहिलेले) संचिका पुन:प्राप्त करीत आहे"
+
+#: apt-pkg/acquire.cc:901
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"काही अनुक्रमणिका संचयिका डाऊनलोड    करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा "
+"त्याऐवजी जुन्या वापरल्या गेल्या."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही "
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "%s पिनचा प्रकार समजलेला नाही"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
+msgid "Could not configure '%s'. "
+msgstr "%s फाईल उघडता येत नाही"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "विक्रेता गट %s मध्ये बोटाचे ठसे नाहीत"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"ह्याचे आधिष्ठापन सुरु करण्यासाठी अत्यावश्यक तात्पुरते काढुन टाकण्याची गरज आहे%s पॅकेज "
+"गुंतागुंतीमुळे/Pre-Depends पूर्व अवलंबित आवर्तन.हे नेहमीच वाईट असते, पण जर तुम्हाला ते खरोखर "
+"करावयाचे असेल तर,APT::Force-LoopBreak पर्याय कार्यान्वित करा."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे."
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "सिडी-रॉम अनमाउंट होत आहे...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "सिडी-रॉमचे माउंट स्थान %s वापरुन\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "सिडी-रॉम अनमाउंट करत आहे\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "डिस्क/चकती करिता प्रतिक्षा करीत आहे...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "सिडी-रॉम माउंट होत आहे...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "ओळखत आहे.."
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "ओळखत आहे..."
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "ग्रहण केलेले नामदर्शक: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "सिडी-रॉम अनमाउंट होत आहे...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "संचिकाच्या यादी/सूचीसाठी डिस्क/चकती बारकाईने तपासत आहे..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "संचिकाच्या यादी/सूचीसाठी डिस्क/चकती बारकाईने तपासत आहे...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3135,22 +2357,22 @@ msgstr ""
 "%zu पॅकेजेसची यादी/सूची, %zu स्त्रोताची यादी/सूची, %zu भाषांतर यादी/सूची आणि %zu "
 "स्वाक्षऱ्या/सिगनेचर्स सापडल्या\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "'%s' लेबल सापडले\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "ते स्विकारण्याजोगे/वैध नांव नाही, पुन्हा प्रयत्न  करा.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3159,302 +2381,1113 @@ msgstr ""
 "ह्या डिस्कला/चकतीला: म्हणतात\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "पॅकेज सूचींच्या प्रती तयार करित आहे..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "नविन स्त्रोत सूची लिहित आहे\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i माहितीसंच लिहिले.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच  लिहिले.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"दोष,पॅकेज समस्या निवारक::निवारण  करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित  "
+"पॅकेजेस असू शकते."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "अवलंबित रचना बांधणी करत आहे"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "कंॅडिडेट आवृत्त्या"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "अवलंबित/विसंबून असलेले उत्पादन "
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "स्थिती माहिती वाचत आहे"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n"
+msgid "Failed to open StateFile %s"
+msgstr "%s StateFile उघडणे असफल"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+msgid "Unable to parse package file %s (1)"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "हॅश बेरीज जुळत नाही"
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "%s कार्य सापडू शकले नाही"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"काही अनुक्रमणिका संचयिका डाऊनलोड    करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा "
-"त्याऐवजी जुन्या वापरल्या गेल्या."
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s उघडत आहे"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "%s संस्थापित होत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "%s संरचित होत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "%s काढून टाकत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s संपूर्ण काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' संचयिका गहाळ आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s फाईल उघडता येत नाही"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "%s तयार करित आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s सुटे/मोकळे करीत आहे "
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s संरचने साठी तयार करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s संस्थापित झाले"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s संपूर्ण काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "%s मध्ये लिहिण्यास असमर्थ "
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s निवडक भाग सापडत नाही"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "%s कुलूप फाईल उघडता येत नाही"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "%s कुलुप मिळवता येत नाही"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "%s उपक्रिया अचानकपणे बाहेर पडली"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "फाईल बंद करण्यात अडचण"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "%s फाईल उघडता येत नाही"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "%s साठी पाईप उघडता येत नाही"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ"
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "फाईल बंद करण्यात अडचण"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "संचिकेची syncing समस्या"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "फाईल अनलिंकिंग करण्यात अडचण"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "संचिकेची syncing समस्या"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... चूक/त्रुटी!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... झाले"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... झाले"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "रिकामी फाईल mmap करता येणार नाही"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "%s साठी पाईप उघडता येत नाही"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "mmap चे %lu बाईटस् करता येणार नाहीत"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "%s उघडण्यास असमर्थ"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "जारी करण्यास करण्यास असमर्थ"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "mmap चे %lu बाईटस् करता येणार नाहीत"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "फाईल छोटी करणे असफल"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "%s माऊंट पॉईंट स्टॅट करण्यास असमर्थ"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "संक्षिप्तरुपाचा माहित नसलेला प्रकार: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "%s संरचना फाईल उघडत आहे"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "रचनेच्या नियमांचा दोष %s:%u: ब्लॉक नावाशिवाय सुरू होतो."
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "रचनेच्या नियमांचा दोष : %s:%u: मालफॉर्मड् टॅग"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "रचनेच्या नियमांचा दोष %s:%u: मुल्यांच्या नंतर अधिक जंक"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "रचनेच्या नियमांचा दोष %s:%u: खूपच एकात एक इनक्लूडस्"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "रचनेच्या नियमांचा दोष %s:%u: ह्या पासून  समाविष्ट "
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "नियम रचनेचा दोष %s:%u: '%s' दिशादर्शक असहाय्यकारी"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "नियम रचनेचा दोष %s:%u: फाईलच्या अंती अधिक जंक"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "संस्थापन खंडित करत आहे."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "आदेश रेखा पर्याय '%c' [पासून %s] हे माहित नाही."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "आदेश रेखा पर्याय %s नीट समजला नाही"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "आदेश रेखा पर्याय %s हे बूलियन नाही"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "पर्याय %s साठी ऑर्गुमेंट पाहिजे"
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "पर्याय %s: संरचितेच्या यादीतील कलमांचा तपशीलाला असलेच पाहिजे ते =<मूल्य>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "%s पर्याय ला पूर्णांक ऑर्गुमेंट पाहिजे,'%s' नको"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "'%s' पर्याय खूप लांब आहे"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "%s संवेदना हे समजत नाही, चूक की बरोबर चा प्रयत्न करा."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "%s अवैध क्रिया"
+
+#: cmdline/apt-extracttemplates.cc:224
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n"
+" \n"
+"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n"
+"डेबियन पॅकेजेस मधून \n"
+"\n"
+"पर्याय : \n"
+" -h    हा साह्याकारी मजकूर \n"
+" -t     टेंप डिर निर्धारित करा \n"
+"  -c=?  ही संरचना संचिका वाचा \n"
+" -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे-  -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s स्टॅट करण्यास असमर्थ"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "पॅकेजेसची विस्तारित यादी खूप मोठी आहे"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s "
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "त्रुटी प्रक्रिया मजकूर %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"वापर:  apt-ftparchive [options] command\n"
+"आज्ञा: 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 डेबियन फाईलसंचासाठी अनुक्रम संचिका निर्माण करतो.तो\n"
+" dpkg-scanpackages व dpkg-scansources करिता निर्मितीच्या संपूर्ण\n"
+" स्वंयंचलित ते कार्यकारी बदलावांपर्यंत अनेक शैलींना पाठबळ देतो\n"
+"\n"
+"apt-ftparchive हा .debsच्या तरुरचनेपासून पॅकेज संचिका निर्माण करतो \n"
+"पॅकेज संचिकेमध्ये प्रत्येक पॅकेज तसेच MD5 हॅश व संचिकाआकारामधील सर्व \n"
+" नियंत्रक क्षेत्रांची माहिती असते.अग्रक्रम आणि विभाग यांच्या मूल्यांचा प्रभाव \n"
+"वाढविण्यासाठी ओव्हरराईड संचिकेला पुष्टि दिलेली असते \n"
+"\n"
+"तसेच apt-ftparchive हा .dscs च्या तरूरचनेपासून उगमस्थान संचिका निर्माण करतो \n"
+"--source-override पर्यायाचा उपयोग एखाद्या src ओव्हरराईड संचिका नेमकेपणाने दाखविण्यास "
+"होतो \n"
+"\n"
+" 'packages' आणि  'sources' आज्ञावली तरूरचनेच्या मुळाशी दिल्या जाव्यात \n"
+"द्वयंक मार्गाचा निर्देश पुनरावर्ती शोधाच्या पाऱ्याकडे केलेला असावा आणि \n"
+" ओव्हरराईड संचिकेमध्ये ओव्हरराईड संकेत (फ्लॅग्ज) असावेत आणि \n"
+" संचिकानामक्षेत्रे असल्यास Pathprefix त्यांना जोडलेले असावेत.\n"
+"डेबियन archiveमधील नमुन्यादाखल उपयोग : \n"
+"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"पर्याय : \n"
+"  -h   हा साह्याकारी मजकूर \n"
+"--md5  MD5  ची निर्मिती नियंत्रित करा \n"
+"  -s=    उगमस्थान ओव्हरराईड संचिका \n"
+" -q     शांत \n"
+"  -d=    पर्यायी दृतिकादायी डेटाबेस निवडा \n"
+" --no-delink दुवा तोडणारा डिबग मार्ग समर्थ करा \n"
+" ---contents  माहिती संचिकेची निर्मिती नियंत्रित करा \n"
+"  -c=?   ही संरचना संचिका वाचा \n"
+"  -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "निवडक भाग जुळत नाही"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB खराब झाली होती, संचिका %s.old म्हणून पुनर्नामांकित केली"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे"
+
+#: ftparchive/cachedb.cc:80
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, "
+"कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा"
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "%s: %s DB संचिका उघडण्यास असमर्थ"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "संकेतक घेण्यास असमर्थ"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E:"
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "धो.सू.:"
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "ई: संचिकेला लागू होणाऱ्या चुका"
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "%s सोडवण्यास असमर्थ"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "ट्री चालणे असमर्थ"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s उघडण्यास असमर्थ"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr "%s [%s] डी दुवा\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "%s वाचणारा दुवा असमर्थ"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "%s दुवा काढण्यास असमर्थ"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "%s चा %s दुवा साधण्यास असमर्थ"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "%sB हीट ची डिलींक मर्यादा\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc-स्मरणस्थळ शोधण्यास असमर्थ"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s उघडण्यास असमर्थ"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "%s दुर्लक्षित संचिका वाचण्यास असमर्थ"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "माहित नसलेली/ले संक्षेप पद्धती/अलगोरिथम '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "%s संकलित आऊटपुट/निर्गत साठी संक्षेप संचाची गरज"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "संचिका * तयार करण्यास असमर्थ"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "नविन प्रक्रिया(प्रोसेस) निर्माण करण्यास असमर्थ"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "चॉईल्ड(प्रोसेस)ला संकलित करा"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IO ची उपक्रिया/संचिका असमर्थ "
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n"
+" \n"
+"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n"
+"डेबियन पॅकेजेस मधून \n"
+"\n"
+"पर्याय : \n"
+" -h    हा साह्याकारी मजकूर \n"
+" -t     टेंप डिर निर्धारित करा \n"
+"  -c=?  ही संरचना संचिका वाचा \n"
+" -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे-  -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "अनोळखी पॅकेज माहिती संच!"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"वापर:apt-sortpkgs [पर्याय] फाईल१[फाईल २...]\n"
+"\n"
+" apt-sortpkgs हे पॅकेज फाईल्सचं वर्गीकरण करणारी एक साधी आज्ञावली आहे. -s  पर्याय हा "
+"फाईल\n"
+"कुठल्या प्रकारची आहे हे दाखवण्यासाठी वापरतात.\n"
+"\n"
+"पर्याय\n"
+"   -h     हा मदत मजकूर\n"
+"   -s     उगमस्थान फाईल वापरा\n"
+"   -c=?   ही संरचना फाईल वाचा\n"
+"   -o=?-  अनियंत्रित संरचना पर्याय निश्चित करा,eg -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s हे वैध डीईबी पॅकेज नाही "
 
diff --git a/po/nb.po b/po/nb.po
index ed0c7b9fe..4afb7f040 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2010-09-01 21:10+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -22,153 +22,154 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.6.1\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Antall pakkenavn: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Antall pakkestrukturer: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Vanlige pakker: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Rent virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Sammensatte virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Mangler: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Antall unike versjoner: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Antall unike beskrivelser: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Antall avhengighetsforhold: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Antall forhold versjon/fil: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Antall forhold beskrivelse/fil: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Antall tilbudte tilknyttinger: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Antall utvidede strenger: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Total plass for avhengighetsforhold/versjoner: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Plass brukt av slark: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Samlet mengde redegjort plass: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ikke oppdatert."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Fant ingen pakker"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Du må oppgi minst ett søkemønster"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Klarer ikke å finne pakken %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Låste pakker:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(ikke funnet)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Pakke låst til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -243,28 +244,28 @@ msgstr ""
 "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 "Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Oppgi et navn for disken, for eksempel «Debian 5.0.3 Disk 1»"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Sett inn en disk i lagringsenheten og trykk Enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Klarte ikke montere «%s» på «%s»"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett."
 
@@ -300,65 +301,65 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Klarte ikke finne noen pakken med regex «%s»"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Klarte ikke finne noen pakken med regex «%s»"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Klarte ikke finne noen pakken med regex «%s»"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Velger «%s» som kildepakke istedenfor «%s»\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Ignorer utilgjengelig versjon «%s» av pakke «%s»"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Klarte ikke å finne pakken %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s satt til manuell installasjon.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s satt til automatisk installasjon.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil, problemløser ødela noe"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke å låse nedlastingsmappa"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Klarer ikke å finne en kildekodepakke for %s"
@@ -383,116 +384,116 @@ msgstr ""
 "bzr get %s\n"
 "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hopper over allerede nedlastet fil «%s»\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Klarte ikke bestemme ledig plass i %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikke nok ledig plass i %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Skaffer kildekode %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikke å skaffe alle arkivene."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Barneprosessen mislyktes"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, 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:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -501,37 +502,37 @@ 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:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikke å behandle forutsetningene for bygging"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Kobler til %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -620,53 +621,74 @@ msgstr ""
 "for mer informasjon og flere valg.\n"
 "                       Denne APT har kraften til en Superku.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Du må angi minst en pakke du vil ha kildekoden til"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "men er ikke installert"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s satt til manuell installasjon.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s satt til automatisk installasjon.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventet på %s, men den ble ikke funnet"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s satt til manuell installasjon.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Klarte ikke å åpne %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -693,7 +715,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -743,52 +765,52 @@ msgstr ""
 msgid "Disk not found."
 msgstr "Disk ikke funnet."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Fant ikke fila"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Klarte ikke å få status"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Klarte ikke å sette endringstidspunkt"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ugyldig adresse. Lokale adresser kan ikke starte med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Logger inn"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Klarte ikke å fastslå navnet på motparten"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Klarte ikke å fastslå det lokale navnet"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Tjeneren nektet oss å kople til og sa: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -796,121 +818,123 @@ msgstr ""
 "En mellomtjener er oppgitt, men ikke noe innloggingsskript. Feltet «Acquire::"
 "ftp::ProxyLogin» er tomt."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Kommandoen «%s» i innlogginsskriptet mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Tidsavbrudd på forbindelsen"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Tjeneren lukket forbindelsen"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Lesefeil"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Et svar oversvømte bufferen."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Protokollødeleggelse"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Skrivefeil"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Klarte ikke å opprette en sokkel"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Mislyktes"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Klarte ikke å koble til en passiv sokkel."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo klarte ikke å opprette en lyttesokkel"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Klarte ikke å binde til sokkel"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Klarte ikke å lytte til sokkel"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Klarte ikke å avgjøre sokkelnavnet"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Klarte ikke å sende PORT-kommandoen"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukjent adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Tidsavbrudd på tilkoblingen til datasokkelen"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Klarte ikke å godta tilkoblingen"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Klarte ikke å hente fila, tjeneren sa «%s»"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Tidsavbrudd på datasokkelen"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverføringen mislykkes, tjeneren sa «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Spørring"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Klarte ikke å starte"
 
@@ -946,7 +970,7 @@ msgstr "Klarte ikke å koble til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kobler til %s"
@@ -976,37 +1000,37 @@ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikke koble til %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ugyldig signatur ble funnet."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Klarte ikke kjøre «gpgv» for å verifisere signaturen (er gpgv installert?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Ukjent feil ved kjøring av gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "De følgende signaturene var ugyldige:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1014,149 +1038,383 @@ msgstr ""
 "De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen "
 "ikke er tilgjengelig:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjeneren"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Utvalget mislykkes"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Tidsavbrudd på forbindelsen"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Venter på hoder"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Ødelagt hodelinje"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Ukjent datoformat"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Ødelagte hodedata"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Beregner oppgradering... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Intern feil - «AllUpgrade» ødela noe"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Utført"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Retter på avhengighetsforhold ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislyktes."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Klarer ikke å rette på avhengighetsforholdene"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarer ikke å minimere oppgraderingsettet"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Utført"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installert"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s skal installeres"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "men lar seg ikke installere"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "men er en virtuell pakke"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "men er ikke installert"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "men skal ikke installeres"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Følgende NYE pakker vil bli installert:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Følgende pakker vil bli FJERNET:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Følgende pakker er holdt tilbake:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Følgende pakker vil bli oppgradert:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Følgende pakker vil bli NEDGRADERT:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Følgende pakker vil bli endret:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (pga. %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
+"Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu oppgraderte, %lu nylig installerte, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu installert på nytt, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderte, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Kompileringsfeil i regulært uttrykk - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Oppdaterings-kommandoen tar ingen argumenter"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil, sortering fullførte ikke"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Må hente %sB/%sB med arkiver.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Må hente %sB med arkiver.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Dessverre, ikke nok ledig plass i %s"
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Ja, gjør som jeg sier!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1167,19 +1425,19 @@ msgstr ""
 "For å fortsette skriv inn teksten «%s»\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Avbryter."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Vil du fortsette?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Klarte ikke laste ned alle filene"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1187,19 +1445,19 @@ msgstr ""
 "Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller "
 "«--fix-missing»."
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "«--fix-missing» og bytte av media støttes nå ikke"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Klarer ikke å rette på manglende pakker."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Avbryter installasjonen."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1213,15 +1471,15 @@ msgstr[1] ""
 "De følgende pakkene forsvant fra systemet ditt siden\n"
 "alle filene er overskrevet av andre pakker:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1239,15 +1497,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1258,7 +1516,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1266,18 +1524,18 @@ msgid_plural ""
 msgstr[0] "%lu pakke ble automatisk installert og er ikke lenger påkrevet.\n"
 msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Bruk «apt-get autoremove» for å fjerne dem."
 msgstr[1] "Bruk «apt-get autoremove» for å fjerne dem."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1285,7 +1543,7 @@ msgstr ""
 "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
 "angi en løsning)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1297,322 +1555,96 @@ msgstr ""
 "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
 "distribusjonen."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Følgende ekstra pakker vil bli installert."
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Foreslåtte pakker:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Anbefalte pakker"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"MERK: Dette er kun en simulering.\n"
+"      apt-get må ha root-rettigheter for reell utførelse.\n"
+"      Husk også at låsing er deaktivert, så ikke regn med \n"
+"      relevans i forhold til den reelle gjeldende situasjonen."
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Autentiseringsadvarsel overstyrt.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Noen pakker ble ikke autentisert"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Installer disse pakkene uten verifikasjon?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikke å skaffe %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installert"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s skal installeres"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "men lar seg ikke installere"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "men er en virtuell pakke"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "men er ikke installert"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "men skal ikke installeres"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Følgende NYE pakker vil bli installert:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Følgende pakker vil bli FJERNET:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Følgende pakker er holdt tilbake:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Følgende pakker vil bli oppgradert:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Følgende pakker vil bli NEDGRADERT:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Følgende pakker vil bli endret:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (pga. %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
-"Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu oppgraderte, %lu nylig installerte, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu installert på nytt, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderte, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Kompileringsfeil i regulært uttrykk - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Retter på avhengighetsforhold ..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " mislyktes."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Klarer ikke å rette på avhengighetsforholdene"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarer ikke å minimere oppgraderingsettet"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Utført"
-
-#: apt-private/private-cachefile.cc:102
-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."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Beregner oppgradering... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Intern feil - «AllUpgrade» ødela noe"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Utført"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"MERK: Dette er kun en simulering.\n"
-"      apt-get må ha root-rettigheter for reell utførelse.\n"
-"      Husk også at låsing er deaktivert, så ikke regn med \n"
-"      relevans i forhold til den reelle gjeldende situasjonen."
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Klarte ikke å endre navnet på %s til %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Funnet "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Hent:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Feil "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Hentet %sB på %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Arbeider]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1625,19 +1657,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarer ikke å lese %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Klarer ikke å endre %s"
@@ -1666,11 +1698,11 @@ msgstr "Ingen speilfil «%s» funnet"
 msgid "[Mirror: %s]"
 msgstr "[Speil: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Klarte ikke å opprette IPC-rør til underprosessen"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen ble uventet stengt"
 
@@ -1711,1353 +1743,475 @@ msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen."
 msgid "Merging available information"
 msgstr "Fletter tilgjengelig informasjon"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates er et verktøy til å hente ut informasjon om "
-"innstillinger\n"
-"og maler fra debianpakker.\n"
-"\n"
-"Innstillinger:\n"
-"  -h   Denne hjelpeteksten\n"
-"  -t   Lag en midlertidig mappe\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kan ikke skrive til %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Lista over pakkeutvidelser er for lang"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Feil ved lesing av katalogen %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Lista over kildeutvidelser er for lang"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Feil ved skriving av topptekst til innholdsfila"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Det oppsto en feil ved lesing av %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Bruk: apt-ftparchive [innstillinger] kommando\n"
-"Kommandoer: packages binærsti [overstyringsfil [sti-prefiks]]\n"
-"          sources kildesti [overstyringsfil [sti-prefiks]]\n"
-"          contents sti\n"
-"          release sti\n"
-"          generate config [grupper]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive oppretter indeksfiler for debianarkiver. Mange ulike\n"
-"metoder er støttet - fra helautomatiske til funksjonelle\n"
-"erstatninger for dpkg-scanpackages og dpkg-scansources.\n"
-"\n"
-"apt-ftparchive oppretter «Packages»-filer fra et tre med debianpakker.\n"
-"«Packages»-fila inneholder alle kontrollfeltene fra hver pakke i tillegg "
-"til\n"
-"MD5-nøkkel og filstørrelse. Du kan bruke en overstyringsfil for å tvinge\n"
-"gjennom verdier for prioritet og kategori.\n"
-"\n"
-"apt-ftparchive kan på samme måte opprette kildefiler fra et tre\n"
-"med .dsc-filer. Du kan bruke en overstyringsfil med --source-override.\n"
-"\n"
-"Kommandoene «packages» og «sources» skal kjøres i rota av katalogtreet.\n"
-"«Binærsti» skal peke til toppkatalogen for det rekursive søket, og\n"
-"overstyringsfila skal inneholde innstillinger for overstyring.\n"
-"Sti-prefikset blir lagt til feltene for filnavn, dersom det er oppgitt. Her "
-"er\n"
-"et eksempel på bruk i debianarkivet:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Innstillinger:\n"
-"  -h    Vis denne hjelpeteksten.\n"
-"  --md5 Styrer MD5-opprettelsen\n"
-"  -s=?  Overstyringsfil for kildekode.\n"
-"  -q    Stille.\n"
-"  -d=?  Velger om du vil bruke en mellomlagerdatabase.\n"
-"  --no-delink Bruk avlusingsmodus med «delinking».\n"
-"  --contents  Styrer opprettelse av innholdsfila.\n"
-"  -c=?  Les denne oppsettsfila.\n"
-"  -o=? Setter en vilkårlig innstilling"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Ingen utvalg passet"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Enkelte filer mangler i pakkegruppa «%s»"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Databasen er gammel, forsøker å oppgradere %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, "
-"fjern og så gjenopprett databasen."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Klarte ikke å åpne Databasefila %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Klarte ikke å få statusen på %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Arkivet har ingen kontrollpost"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Klarte ikke å finne en peker"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Klarte ikke å lese katalogen %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: Klarte ikke å få statusen på %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "F:"
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "A:"
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "F: Det er feil ved fila"
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Klarte ikke å slå opp %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Klarte ikke å finne fram i treet"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Klarte ikke å åpne %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Klarte ikke å lese lenken %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Klarte ikke å oppheve lenken %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Klarte ikke å lenke %s til %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-grensa på %s B er nådd.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Arkivet har ikke noe pakkefelt"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har ingen overstyringsoppføring\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " %s-vedlikeholderen er %s, ikke %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har ingen kildeoverstyringsoppføring\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s har ingen binæroverstyringsoppføring heller\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Klarte ikke å tildele minne"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Klarte ikke å åpne %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Ugyldig overstyring %s linje %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Klarte ikke å lese overstyringsfila %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Ugyldig overstyring %s linje %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Ugyldig overstyring %s linje %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Ugyldig overstyring %s linje %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Ukjent komprimeringsalgoritme «%s»"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimert utdata %s trenger et komprimeringssett"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Klarte ikke å opprette FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Klarte ikke å forgreine prosess"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Komprimer barneprosess"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Intern feil, klarte ikke å opprette %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Klarte ikke å kommunisere med underprosess/fil"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Klarte ikke å lese under utregning av MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem ved oppheving av lenken til %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Klarte ikke å endre navnet på %s til %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates er et verktøy til å hente ut informasjon om "
-"innstillinger\n"
-"og maler fra debianpakker.\n"
-"\n"
-"Innstillinger:\n"
-"  -h   Denne hjelpeteksten\n"
-"  -t   Lag en midlertidig mappe\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Ukjent pakkeoppføring"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Bruk: apt-sortpkgs [innstillinger] fil1 [fil2 ...]\n"
-"\n"
-"apt-sortpkgs er et enkelt redskap til å sortere pakkefiler. Innstillingen\n"
-"-s brukes til å angi hvilken filtype det er.\n"
-"\n"
-"Innstillinger:\n"
-"  -h   Denne hjelpeteksten\n"
-"  -s   Bruk filsortering\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Klarte ikke å opprette rør"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Klarte ikke å kjøre gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Ødelagt arkiv"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Ukjent TAR-hode: type %u, medlem %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Ugyldig arkivsignatur"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Feil ved lesing av arkivmedlemshode"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ugyldig arkivmedlemshode %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Ugyldig arkivmedlemshode"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arkivet er for kort"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Klarte ikke å lese arkivhodene"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode ble startet på et knutepunkt som ennå er lenket"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Fant ikke nøkkelelementet."
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Klarte ikke å tildele avledning"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Intern feil i AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Prøver å skrive over en avledning, %s -> %s og %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dobbel tillegging av avledning %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Dobbel oppsettsfil %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Klarte ikke å skrive fila %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Klarte ikke å lukke fila %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Stien %s er for lang"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Pakker ut %s mer enn en gang"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Katalogen %s er avledet"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Pakken prøver å skrive til avledningsmålet %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Avledningsstien er for lang"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Klarte ikke å få statusen på %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Klarte ikke å endre navnet på %s til %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Mappa %s blir byttet ut med noe som ikke er en mappe"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Fant ikke knutepunktet i dens hash-spann"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Stien er for lang"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Skriver over pakketreff uten versjon for %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Klarte ikke å få statusen på %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Klarte ikke å skrive fila %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Klarte ikke å lukke fila %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Intern feil, fant ikke medlemmet %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Kontrollfila kan ikke tolkes"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Kan ikke utføre mmap på en tom fil"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Klarte ikke duplisere fildeskriptor %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Klarte ikke lage mmap av %lu bytes"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Klarte ikke lukke mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Klarte ikke synkronisere mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Klarte ikke lage mmap av %lu bytes"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Klarte ikke forkorte fila %s"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Start. "
-"Nåværende verdi: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Klarte ikke øke størrelsen på MMap-en siden grensen på %lu byte allerede er "
-"nådd."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Klarte ikke øke størrelsen på MMap-en siden automatisk voksing er deaktivert "
-"av brukeren."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lit %lim %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lit %lim %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%lim %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Fant ikke utvalget %s"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ugyldig arkivsignatur"
 
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Ukjent typeforkortelse: «%c»"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Feil ved lesing av arkivmedlemshode"
 
-#: apt-pkg/contrib/configuration.cc:617
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Åpner oppsettsfila %s"
+msgid "Invalid archive member header %s"
+msgstr "Ugyldig arkivmedlemshode %s"
 
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Syntaksfeil %s:%u: Blokka starter uten navn."
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ugyldig arkivmedlemshode"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaksfeil %s:%u: Feil på taggen"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arkivet er for kort"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Klarte ikke å lese arkivhodene"
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Klarte ikke å opprette rør"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntaksfeil %s:%u: For mange nøstede inkluderte filer"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Klarte ikke å kjøre gzip "
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaksfeil %s:%u: Inkludert herfra"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Ødelagt arkiv"
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikke støttet"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "Syntaksfeil %s:%u: clear-direktivet krever et valgtre som argument"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Ukjent TAR-hode: type %u, medlem %s"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila"
+msgid "Unable to stat %s."
+msgstr "Klarer ikke finne informasjonom %s."
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s ... Feil"
-
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s ... Ferdig"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s ... Ferdig"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Kjenner ikke kommandolinjevalget «%c» (fra %s)."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Skjønner ikke kommandolinjevalget %s"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Kommandolinjevalget %s er ikke boolsk"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Valget %s krever et argument."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Valg %s: Angivelsen av oppsettselementet må ha en =<verdi>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Valget %s må ha et heltallsargument, ikke «%s»"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Valget «%s» er for langt"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Skjønner ikke %s. Prøv «true» eller «false»."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Ugyldig operasjon %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Klarer ikke å fastsette monteringspunktet %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Klarer ikke å få statusen på CD-spilleren"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problem ved låsing av gzip-fila %s"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Klarte ikke åpne låsefila %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Bruker ikke låsing på den nfs-monterte låsefila %s"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Får ikke låst %s"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Kjører dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgid "Packaging system '%s' is not supported"
+msgstr "Pakkesystemet «%s» støttes ikke"
 
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Klarer ikke bestemme en passende pakkesystemtype"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgid "Wrote %i records.\n"
+msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Underprosessen %s mottok et minnefeilsignal."
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Skrev %i poster med %i manglende filer.\n"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Underprosessen %s mottok signalet %u."
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Skrev %i poster med %i feile filer.\n"
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Underprosessen %s ga en feilkode (%u)"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Underprosessen %s avsluttet uventet"
+msgid "Can't find authentication record for: %s"
+msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file %s"
-msgstr "Klarte ikke åpne fila %s"
+msgid "Hash mismatch for: %s"
+msgstr "Hashsummen stemmer ikke for: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Klarte ikke åpne fildeskriptor %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Klarte ikke å opprette underprosessen IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Klarte ikke å kjøre komprimeringen"
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen"
+msgid "The method driver %s could not be found."
+msgstr "Finner ikke metode-driveren %s."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å"
+msgid "Is the package %s installed?"
+msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "Problem ved låsing av fila %s"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startet ikke korrekt"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problem ved endring av navn på fila %s til %s"
+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/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problem ved oppheving av lenke til fila %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Pakkelista eller tilstandsfila kunne ikke fortolkes eller åpnes."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problem ved oppdatering av fila"
+#: apt-pkg/cachefile.cc:98
+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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nøkkelring installert i %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Kan ikke lese kildlista."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Pakkens lagerfil er ødelagt"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Pakkens lagerfil er ødelagt"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Denne APT støtter ikke versjonssystemet «%s»"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Pakkelageret ble bygd for en annen arkitektur"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Avhenger av"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Forutsetter"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Foreslår"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Anbefaler"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Er i konflikt med"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Nuller"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Ødelegger"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Forbedrer"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "påkrevet"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "vanlig"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "valgfri"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Skaper oversikt over avhengighetsforhold"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Versjons-kandidater"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Oppretter avhengighetsforhold"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Leser tilstandsinformasjon"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikke å åpne StateFile %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikke å skrive midlertidig StateFile %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Klarer ikke å fortolke pakkefila %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Klarer ikke å fortolke pakkefila %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Feil på linje %lu i kildelista %s (nettadresse)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Feil på linje %lu i kildelista %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Feil på %lu i kildelista %s (Absolutt dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Feil på %lu i kildelista %s (dist fortolking)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Åpner %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linje %u i kildelista %s er for lang"
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Feil på %u i kildelista %s (type)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Klarte ikke gjennomføre umiddelbar konfigurasjon av «%s». Se man 5 apt.conf "
-"under APT::Immediate-Configure for detaljer. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Klarte ikke åpne fila «%s»"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Den forestående installasjon må midlertidig fjerne den meget viktige pakken "
-"%s pga. en konflikt/forutsettelses-løkke. Dette er ofte stygt, men hvis du "
-"virkelig vil det, så bruk innstillingen APT::Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Oversiktsfil av typen «%s» støttes ikke"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
-"som holdes tilbake."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Listemappa %spartial mangler."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arkivmappa %spartial mangler."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Klarte ikke låse mappa %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Henter fil %li av %li (%s gjenværende)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Henter fil %li av %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finner ikke metode-driveren %s."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startet ikke korrekt"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Pakkesystemet «%s» støttes ikke"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Klarer ikke bestemme en passende pakkesystemtype"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Klarer ikke finne informasjonom %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Beklager, du må legge inn noen kilder (nettadresser) i din «sources.list»."
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Pakkelista eller tilstandsfila kunne ikke fortolkes eller åpnes."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Kan ikke lese kildlista."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Ugyldig oppslag i foretrekksfila %s, manglende pakkehode"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Forsto ikke spikring av typen %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Ingen prioritet (eller null) spesifisert for pin"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Lageret har et uoverensstemmende versjonssystem"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Feil oppsto under behandling av %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Jøss, du har overgått antallet pakkenavn denne APT klarer."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jøss, du har overgått antallet versjoner denne APT klarer."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Jøss, du har overgått antallet beskrivelser denne APT klarer."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Fant ikke pakken %s %s ved behandling av filkrav"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Leser pakkelister"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Samler inn filtilbud"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kan ikke skrive til %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "IO-feil ved lagring av kildekode-lager"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Hashsummen stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Feil størrelse"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Klarer ikke å fortolke Release-fila %s"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3067,12 +2221,12 @@ msgstr ""
 "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-feil: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3081,82 +2235,145 @@ msgstr ""
 "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
 "selv (fordi arkitekturen mangler)."
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Klarer ikke å fortolke Release-fila %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Ingen avsnitt i Release-fila %s"
+msgid "List directory %spartial is missing."
+msgstr "Listemappa %spartial mangler."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ingen sjekksumoppføring i Release-fila %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Arkivmappa %spartial mangler."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
+msgid "Unable to lock directory %s"
+msgstr "Klarte ikke låse mappa %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Henter fil %li av %li (%s gjenværende)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk"
+msgid "Retrieving file %li of %li"
+msgstr "Henter fil %li av %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
+"ble brukt isteden. "
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Beklager, du må legge inn noen kilder (nettadresser) i din «sources.list»."
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Ugyldig oppslag i foretrekksfila %s, manglende pakkehode"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Forsto ikke spikring av typen %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Ingen prioritet (eller null) spesifisert for pin"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Klarte ikke gjennomføre umiddelbar konfigurasjon av «%s». Se man 5 apt.conf "
+"under APT::Immediate-Configure for detaljer. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Klarte ikke åpne fila «%s»"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Den forestående installasjon må midlertidig fjerne den meget viktige pakken "
+"%s pga. en konflikt/forutsettelses-løkke. Dette er ofte stygt, men hvis du "
+"virkelig vil det, så bruk innstillingen APT::Force-LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Linje %u i kildelista %s er for lang"
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Avmonterer CD-ROM ...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Bruker CD-ROM monteringspunkt %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Avmonterer CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Venter på CD-en...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Monterer CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "Indentifiserer.."
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "Indentifiserer..."
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Lagret merkelapp: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Avmonterer CD-ROM ...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "Leter gjennom CD for indeksfiler..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "Leter gjennom CD for indeksfiler...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3165,7 +2382,7 @@ msgstr ""
 "Fant %zu pakkeindekser, %zu kildeindekser, %zu oversettelsesindekser og %zu "
 "signaturer\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3173,16 +2390,16 @@ msgstr ""
 "Klarte ikke finne noen Package-filer. Kanskje dette ikke er en Debian Disc "
 "eller du har valgt feil arkitektur?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Fant merkelapp «%s»\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Det er ikke et gyldig navn, prøv igjen.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3191,79 +2408,104 @@ msgstr ""
 "CD-en er kalt: \n"
 "«%s»\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Kopierer pakkelister..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Skriver ny kildeliste\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Kildelisteoppføringer for denne CD-en er:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Skrev %i poster.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Skrev %i poster med %i manglende filer.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
+"som holdes tilbake."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Skaper oversikt over avhengighetsforhold"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versjons-kandidater"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Oppretter avhengighetsforhold"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Leser tilstandsinformasjon"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Skrev %i poster med %i feile filer.\n"
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikke å åpne StateFile %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, 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"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikke å skrive midlertidig StateFile %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Klarer ikke å fortolke pakkefila %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hashsummen stemmer ikke for: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Klarer ikke å fortolke pakkefila %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Utgave «%s» av «%s» ble ikke funnet"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versjon «%s» av «%s» ble ikke funnet"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Klarte ikke å finne oppgave «%s»"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Klarte ikke finne noen pakken med regex «%s»"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Klarte ikke finne noen pakken med regex «%s»"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Klarte ikke velge versjoner fra pakken «%s» siden den er kun virtuell"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3272,176 +2514,238 @@ msgstr ""
 "Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
 "har ingen av dem"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Klarte ikke velge nyeste versjon fra pakken «%s» siden den er kun virtuell"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Klarte ikke velge kandidatversjon fra pakken «%s» siden den ikke har noen "
 "kandidat"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Klarte ikke velge installert versjon fra pakken «%s» siden den ikke er "
 "installert"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Klarer ikke å fortolke Release-fila %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Ingen avsnitt i Release-fila %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ingen sjekksumoppføring i Release-fila %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Kjører dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
-"ble brukt isteden. "
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Feil på linje %lu i kildelista %s (nettadresse)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Feil på linje %lu i kildelista %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Feil på %lu i kildelista %s (Absolutt dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Feil på %lu i kildelista %s (dist fortolking)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Åpner %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Feil på %u i kildelista %s (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Setter opp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Fjerner %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Legger merke til at %s forsvinner"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Kjører etter-installasjonsutløser %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappa «%s» mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikke åpne fila «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Forbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker ut %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Forbereder oppsett av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Installerte %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Forbereder fjerning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Forbereder å fullstendig slette %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernet %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Kan ikke skrive til %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "avhengighetsproblemer - lar den være uoppsatt"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3449,7 +2753,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
 "følgefeil fra en tidligere feil."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3457,7 +2761,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
 "feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3465,7 +2769,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
 "minne»-feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3474,13 +2778,13 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
 "feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «dpkg I/O»-feil"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3488,23 +2792,752 @@ msgid ""
 msgstr ""
 "Klarte ikke låse den administrative mappen (%s). Bruker en annen prosess den?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Klarte ikke låse den administrative mappen (%s). Er du root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Ikke låst"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lit %lim %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lit %lim %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%lim %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Fant ikke utvalget %s"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Klarte ikke åpne låsefila %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Bruker ikke låsing på den nfs-monterte låsefila %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Får ikke låst %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Underprosessen %s mottok et minnefeilsignal."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Underprosessen %s mottok signalet %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Underprosessen %s ga en feilkode (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Underprosessen %s avsluttet uventet"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problem ved låsing av gzip-fila %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Klarte ikke åpne fila %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Klarte ikke åpne fildeskriptor %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Klarte ikke å opprette underprosessen IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Klarte ikke å kjøre komprimeringen"
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problem ved låsing av fila %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem ved endring av navn på fila %s til %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problem ved oppheving av lenke til fila %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problem ved oppdatering av fila"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s ... Feil"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s ... Ferdig"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s ... Ferdig"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Kan ikke utføre mmap på en tom fil"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Klarte ikke duplisere fildeskriptor %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Klarte ikke lage mmap av %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Klarte ikke lukke mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Klarte ikke synkronisere mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Klarte ikke lage mmap av %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Klarte ikke forkorte fila %s"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Start. "
+"Nåværende verdi: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Klarte ikke øke størrelsen på MMap-en siden grensen på %lu byte allerede er "
+"nådd."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Klarte ikke øke størrelsen på MMap-en siden automatisk voksing er deaktivert "
+"av brukeren."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Klarer ikke å fastsette monteringspunktet %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Klarer ikke å få statusen på CD-spilleren"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Ukjent typeforkortelse: «%c»"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Åpner oppsettsfila %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaksfeil %s:%u: Feil på taggen"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaksfeil %s:%u: Inkludert herfra"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, 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:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "Syntaksfeil %s:%u: clear-direktivet krever et valgtre som argument"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nøkkelring installert i %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Kjenner ikke kommandolinjevalget «%c» (fra %s)."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Skjønner ikke kommandolinjevalget %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Kommandolinjevalget %s er ikke boolsk"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Valget %s krever et argument."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Valg %s: Angivelsen av oppsettselementet må ha en =<verdi>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Valget %s må ha et heltallsargument, ikke «%s»"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Valget «%s» er for langt"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Skjønner ikke %s. Prøv «true» eller «false»."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Ugyldig operasjon %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates er et verktøy til å hente ut informasjon om "
+"innstillinger\n"
+"og maler fra debianpakker.\n"
+"\n"
+"Innstillinger:\n"
+"  -h   Denne hjelpeteksten\n"
+"  -t   Lag en midlertidig mappe\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Klarte ikke å få statusen på %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Lista over pakkeutvidelser er for lang"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Feil ved lesing av katalogen %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Lista over kildeutvidelser er for lang"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Feil ved skriving av topptekst til innholdsfila"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Det oppsto en feil ved lesing av %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Bruk: apt-ftparchive [innstillinger] kommando\n"
+"Kommandoer: packages binærsti [overstyringsfil [sti-prefiks]]\n"
+"          sources kildesti [overstyringsfil [sti-prefiks]]\n"
+"          contents sti\n"
+"          release sti\n"
+"          generate config [grupper]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive oppretter indeksfiler for debianarkiver. Mange ulike\n"
+"metoder er støttet - fra helautomatiske til funksjonelle\n"
+"erstatninger for dpkg-scanpackages og dpkg-scansources.\n"
+"\n"
+"apt-ftparchive oppretter «Packages»-filer fra et tre med debianpakker.\n"
+"«Packages»-fila inneholder alle kontrollfeltene fra hver pakke i tillegg "
+"til\n"
+"MD5-nøkkel og filstørrelse. Du kan bruke en overstyringsfil for å tvinge\n"
+"gjennom verdier for prioritet og kategori.\n"
+"\n"
+"apt-ftparchive kan på samme måte opprette kildefiler fra et tre\n"
+"med .dsc-filer. Du kan bruke en overstyringsfil med --source-override.\n"
+"\n"
+"Kommandoene «packages» og «sources» skal kjøres i rota av katalogtreet.\n"
+"«Binærsti» skal peke til toppkatalogen for det rekursive søket, og\n"
+"overstyringsfila skal inneholde innstillinger for overstyring.\n"
+"Sti-prefikset blir lagt til feltene for filnavn, dersom det er oppgitt. Her "
+"er\n"
+"et eksempel på bruk i debianarkivet:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Innstillinger:\n"
+"  -h    Vis denne hjelpeteksten.\n"
+"  --md5 Styrer MD5-opprettelsen\n"
+"  -s=?  Overstyringsfil for kildekode.\n"
+"  -q    Stille.\n"
+"  -d=?  Velger om du vil bruke en mellomlagerdatabase.\n"
+"  --no-delink Bruk avlusingsmodus med «delinking».\n"
+"  --contents  Styrer opprettelse av innholdsfila.\n"
+"  -c=?  Les denne oppsettsfila.\n"
+"  -o=? Setter en vilkårlig innstilling"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Ingen utvalg passet"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Enkelte filer mangler i pakkegruppa «%s»"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Databasen er gammel, forsøker å oppgradere %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, "
+"fjern og så gjenopprett databasen."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Klarte ikke å åpne Databasefila %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Arkivet har ingen kontrollpost"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Klarte ikke å finne en peker"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Klarte ikke å lese katalogen %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "A: Klarte ikke å få statusen på %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "F:"
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "A:"
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "F: Det er feil ved fila"
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Klarte ikke å slå opp %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Klarte ikke å finne fram i treet"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Klarte ikke å åpne %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Klarte ikke å lese lenken %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Klarte ikke å oppheve lenken %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Klarte ikke å lenke %s til %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink-grensa på %s B er nådd.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Arkivet har ikke noe pakkefelt"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s har ingen overstyringsoppføring\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr " %s-vedlikeholderen er %s, ikke %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s har ingen kildeoverstyringsoppføring\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s har ingen binæroverstyringsoppføring heller\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Klarte ikke å tildele minne"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Klarte ikke å åpne %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Ugyldig overstyring %s linje %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Klarte ikke å lese overstyringsfila %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Ugyldig overstyring %s linje %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Ugyldig overstyring %s linje %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Ugyldig overstyring %s linje %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Ukjent komprimeringsalgoritme «%s»"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimert utdata %s trenger et komprimeringssett"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Klarte ikke å opprette FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Klarte ikke å forgreine prosess"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Komprimer barneprosess"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Intern feil, klarte ikke å opprette %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Klarte ikke å kommunisere med underprosess/fil"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Klarte ikke å lese under utregning av MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem ved oppheving av lenken til %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates er et verktøy til å hente ut informasjon om "
+"innstillinger\n"
+"og maler fra debianpakker.\n"
+"\n"
+"Innstillinger:\n"
+"  -h   Denne hjelpeteksten\n"
+"  -t   Lag en midlertidig mappe\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Ukjent pakkeoppføring"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Bruk: apt-sortpkgs [innstillinger] fil1 [fil2 ...]\n"
+"\n"
+"apt-sortpkgs er et enkelt redskap til å sortere pakkefiler. Innstillingen\n"
+"-s brukes til å angi hvilken filtype det er.\n"
+"\n"
+"Innstillinger:\n"
+"  -h   Denne hjelpeteksten\n"
+"  -s   Bruk filsortering\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s er ikke en gyldig debianpakke."
 
diff --git a/po/ne.po b/po/ne.po
index 1779c9f4a..540324d6e 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -17,156 +17,157 @@ msgstr ""
 "Plural-Forms: nplurals=2;plural=(n!=1)\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "प्याकेज %s संस्करण %s संग एउटा नभेटिएको dep छ:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "कूल प्याकेज नामहरू :"
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "कूल प्याकेज नामहरू :"
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  सामान्य प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "शुद्ध अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  एकल अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  मिश्रित अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  हराइरहेको:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "कूल भिन्न संस्करणहरू:"
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "कूल भिन्न संस्करणहरू:"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "कूल निर्भरताहरू:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "कूल उपलब्ध मानचित्रणहरू:"
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "कूल विश्वव्यापी स्ट्रिङ्गहरू:"
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "कूल निर्भरता संस्करण खाली ठाऊँ:"
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "कूल शिथिल खाली ठाऊँ:"
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "को लागि कूल खाली ठाऊँ लेखांकन:"
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।"
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "कुनै प्याकेजहरू फेला परेन"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "तपाईँले एउटा वास्तविक बान्की दिनुपर्छ"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "प्याकेज %s तोक्न असक्षम भयो"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "प्याकेज फाइलहरू:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "क्यास sync  भन्दा बाहिर छ, प्याकेज फाइल x-ref गर्न सक्दैन"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "पिन गरिएका प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(फेला परेन)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  स्थापना भयो:"
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  उमेद्वार:"
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(कुनै पनि होइन)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "प्याकेज पिन:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  संस्करण तालिका:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -240,29 +241,29 @@ msgstr ""
 "  -o=? एउटा स्वेच्छाचारी कनफिगरेसन फाइल सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 "धेरै जानकारीकोप लागि apt-cache(8) र apt.conf(5) म्यानुल पृष्टहरू हेर्नुहोस्  ।\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "कृपया यो डिस्कको लागि नाम उपलब्ध गराउनुहोस्, जस्तै 'Debian 2.1r1 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "कृपया ड्राइभमा डिस्क घुसाउनुहोस् र इन्टर थिच्नुहोस्"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "तपाईँको सेटमा बाँकी सि डि हरुको लागि यो प्रक्रिया फेरी गर्नुहोस् । "
 
@@ -298,65 +299,65 @@ msgstr ""
 "  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
 "  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
@@ -376,114 +377,114 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "स्रोत फड्काउनुहोस् %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "केही संग्रह फड्काउन असफल भयो ।"
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "शाखा प्रक्रिया असफल भयो"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, 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:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -492,37 +493,37 @@ msgstr ""
 "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
 "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) मा जडान गरिदैछ"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "समर्थित मोड्युलहरू:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -607,53 +608,74 @@ msgstr ""
 "pages हेर्नुहोस् ।\n"
 "                       APT संग सुपर काउ शक्तिहरू छ ।\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "तर यो स्थापना भएन"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s खोल्न असफल"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -680,7 +702,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -728,52 +750,52 @@ msgstr "%s मा सिडी रोम अनमाउन्ट गर्न �
 msgid "Disk not found."
 msgstr "डिस्क फेला परेन ।"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "फाइल फेला परेन "
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "स्थिर गर्न असफल भयो"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "परिमार्जन समय सेट असफल भयो"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "अवैध URl, स्थानिय URIS // संग सुरू हुन सक्दैन"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "लगइन भइरहेछ"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "समान नाम निर्धारण गर्न असक्षम भयो"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "स्थानिय नाम निर्धारण गर्न असक्षम भयो"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "सर्भरले जडान अस्वीकार गर्यो र भन्यो: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "प्रयोगकर्ता असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "पास असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -781,121 +803,123 @@ msgstr ""
 "प्रोक्सी सर्भर निर्दिष्ट गरियो तर कुनै स्क्रिफ्ट लगइन भएन, Acquire::ftp::ProxyLogin  "
 "खाली छ ।"
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "लगइन स्क्रिफ्ट आदेश '%s' असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "टाइप असफल भयो: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "जडान समय सकियो"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "सर्भरले जडान बन्द गर्यो"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "त्रुटि पढ्नुहोस्"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "एउटा प्रतिक्रियाले बफर अधिप्रवाह गर्यो"
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "प्रोटोकल दूषित"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "त्रुटि लेख्नुहोस्"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "एउटा सकेट सिर्जना गर्न सकेन"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "असफल भयो"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "निस्क्रिय सकेट जडान गर्न सकिएन"
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo सुन्ने सकेट प्राप्त गर्न असक्षम भयो"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "सकेट बाँध्न सकिएन"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "सकेटमा सुन्न सकिएन"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "सकेट नाम निर्धारण गर्न सकिएन"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "पोर्ट आदेश पठाउन असक्षम भयो"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "अज्ञात ठेगाना परिवार %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "डेटा सकेटको जडान समय सकियो"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "जडान स्वीकार गर्न असक्षम भयो"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "समस्या द्रुतान्वेषण फाइल"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "फाइल तान्न असक्षम भयो, सर्भरले भन्यो '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "डेटा सकेट समय सकियो"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "डेटा स्थान्तरण असफल भयो, सर्भरले भन्यो '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "क्वेरी"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "आह्वान गर्न असक्षम भयो"
 
@@ -931,7 +955,7 @@ msgstr " %s:%s (%s) मा जडान गर्न सकिएन ।"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s मा जडान गरिदैछ"
@@ -961,182 +985,416 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s मा जडान गर्न असफल भयो:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "सर्भरबाट त्रुटि पढिदैछ"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "असफल चयन गर्नुहोस्"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "जडान समय सकियो"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "हेडरहरुको लागि पर्खिदैछ"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "खराब हेडर लाइन"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर्भरले अवैध जवाफ हेडर पठायो"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर्भरले अवैध सामग्री-लम्बाई हेडर पठायो"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर्भरले अवैध सामग्री-दायरा हेडर पठायो"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर्भर संग भाँचिएको दायरा समर्थन छ"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "अज्ञात मिति ढाँचा"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "खराब हेडर डेटा"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "स्तर वृद्धि गणना गरिदैछ..."
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "काम भयो"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "निर्भरताहरू सुधार गरिदैछ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr "असफल भयो ।"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr "काम भयो"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "तर %s स्थापना भयो"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "तर %s स्थापना हुनुपर्यो"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "तर यो स्थापनायोग्य छैन"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "तर यो अवास्तविक प्याकेज होइन"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "तर यो स्थापना भएन"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "तर यो स्थापना हुन गइरहेको छैन"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr "वा"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s कारणले) "
+
+#: apt-private/private-output.cc:662
+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"
+"तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu पुन: स्थापना गरियो, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu स्तर कम गरियो, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।"
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr "कस्तो नमिलेको.. साइजहरू मेल खाएन, apt@packages.debian.org इमेल गर्नुहोस्"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक ।\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "संग्रहहरुको %sB प्राप्त गर्न आवश्यक ।\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "अनप्याक गरिसके पछि थप डिस्क खाली ठाउँको %sB प्रयोग हुनेछ ।\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।"
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।"
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "हो,मैले भने जस्तै गर्नुहोस्!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1147,20 +1405,20 @@ msgstr ""
 "निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "परित्याग गर्नुहोस् ।"
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1168,19 +1426,19 @@ msgstr ""
 "केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास "
 "गर्नुहुन्छ ?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।"
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "स्थापना परित्याग गरिदैछ ।"
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1190,15 +1448,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1214,16 +1472,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1233,7 +1491,7 @@ msgid_plural ""
 msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1241,17 +1499,17 @@ msgid_plural ""
 msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "तपाईँ यसलाई सुधार गर्न 'apt-get -f install' चलाउन चाहनुहुन्छ:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1259,7 +1517,7 @@ msgstr ""
 "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
 "समाधान निर्दिष्ट गर्नुहोस्) ।"
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1272,319 +1530,93 @@ msgstr ""
 " वितरण अहिले सम्म सिर्जना\n"
 " भएको छैन वा आवगमन विनानै सर्यो ।"
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "भाँचिएका प्याकेजहरू"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "सुझाव दिएका प्याकेजहरू:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "सिफारिस गरिएका प्याकेजहरू:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! "
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 #, fuzzy
 msgid "Install these packages without verification?"
 msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? "
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s तान्न असफल भयो\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "तर %s स्थापना भयो"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "तर %s स्थापना हुनुपर्यो"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "तर यो स्थापनायोग्य छैन"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "तर यो अवास्तविक प्याकेज होइन"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "तर यो स्थापना भएन"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "तर यो स्थापना हुन गइरहेको छैन"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr "वा"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s कारणले) "
-
-#: apt-private/private-output.cc:631
-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"
-"तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu पुन: स्थापना गरियो, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu स्तर कम गरियो, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "निर्भरताहरू सुधार गरिदैछ..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr "असफल भयो ।"
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr "काम भयो"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "स्तर वृद्धि गणना गरिदैछ..."
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "काम भयो"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "हान्नुहोस्"
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "प्राप्त गर्नुहोस्:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s (%sB/s) मा %sB मा तानियो\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [काम गरिरहेको]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1597,19 +1629,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s पढ्न असफल भयो"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s मा परिवर्तन गर्न असक्षम"
@@ -1638,11 +1670,11 @@ msgstr "फाइल %s खोल्न सकिएन"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "जडान असमायिक बन्द भयो"
 
@@ -1684,1344 +1716,475 @@ msgstr ""
 msgid "Merging available information"
 msgstr "उपलब्ध सूचना गाँभिदैछ"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
-"\n"
-"\n"
-"विकल्पहरू:\n"
-"  -h   यो मद्दत पाठ\n"
-"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
-"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr " %s मा लेख्न असक्षम"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "प्याकेज विस्तार सूचि अति लामो छ"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "स्रोत विस्तार सूचि अति लामो छ"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"उपयोग: apt-ftparchive [विकल्पहरू] आदेश\n"
-"आदेशहरू: 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 ले डेवियन संग्रहहरुको लागि अनुक्रमणिका फाइलहरू सिर्जना गर्दछ । यसले "
-"समर्थन गर्दछ\n"
-"dpkg-scanpackages र dpkg-scansources को लागि कार्यात्मक प्रतिस्थापनमा पुरै "
-"स्वचालितबाट सिर्जनाको धेरै शैलीहरू\n"
-" \n"
-"\n"
-"apt-ftparchive ले debs को ट्रीबाट प्याकेज फाइलहरू सिर्जना गर्दछ । प्याकेज\n"
-"फाइलहरुले प्रत्येक प्याकेजबाट सबै नियन्त्रण फाँटहरुको सामग्रीहरू साथ साथै MD5 hash र "
-"filesize समावेश गर्दछ ।\n"
-"एउटा अधिलेखन फाइल\n"
-"प्राथमिकता र सेक्सनको मान जोड गर्न समर्थित हुन्छ ।\n"
-"\n"
-"त्यस्तै गरी apt-ftparchive ले .dscs को ट्रीबाट स्रोत फाइलहरू सिर्जना गर्दछ ।\n"
-"स्रोत--अधिलेखन--विकल्प src अधीलेखन फाइल निर्दिष्ट गर्न प्रयोग गर्न सकिन्छ\n"
-"\n"
-"'packages' and 'sources' आदेश ट्रीको मूलमा चलाउन सकिन्छ ।\n"
-" विनारी मार्ग फेरी हुने खोजीको विन्दुमा आधारित हुन्छ र \n"
-"अधिलेखन फाइलले अधिलेखन झण्डाहरू समाविष्ट गर्दछ । यदि उपस्थित छ भने बाटो उपसर्ग\n"
-"फाइलनाम फाँटहरुमा थपिन्छ । उदाहरणको लागि \n"
-"डेवियन संग्रहबाट उपयोग:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"विकल्पहरू:\n"
-"  -h    यो मद्दत पाठ\n"
-"  --md5 नियन्त्रण MD5 सिर्जना\n"
-"  -s=?  स्रोत अधिलेखन फाइल\n"
-"  -q    बन्द गर्नुहोस्\n"
-"  -d=?  वैकल्पिक क्यासिङ डेटाबेस चयन गर्नुहोस्\n"
-"  --no-delink delinking डिबग मोड सक्षम गर्नुहोस्\n"
-"  --सामग्रीहरू  सामग्री फाइल सिर्जना नियन्त्रण गर्नुहोस्\n"
-"  -c=?  यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-"  -o=?  एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "कुनै चयनहरू मेल खाएन"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "DB फाइल %s असक्षम भयो: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr " %s स्थिर गर्न असफल"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: %s स्थिर गर्न असक्षम\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्"
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s हल गर्न असफल भयो"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "ट्री हिडाईँ असफल भयो"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s खोल्न असफल"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "लिङ्क पढ्न असफल %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "अनलिङ्क गर्न असफल %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s मा %s लिङ्क असफल भयो"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s संभारकर्ता %s हो %s होइन\n"
-
-#: ftparchive/writer.cc:712
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-
-#: ftparchive/writer.cc:716
-#, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s खोल्न असफल"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "अधिलेखन फाइल पढ्न असफल %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #२"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #३"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "FILE* सिर्जना गर्न असफल"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "काँटा गर्न असफल"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "सङ्कुचन शाखा"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "MD5 गणना गर्दा पढ्न असफल भयो"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "समस्या अनलिङ्क भइरहेछ %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
-"\n"
-"\n"
-"विकल्पहरू:\n"
-"  -h   यो मद्दत पाठ\n"
-"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
-"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "अज्ञात प्याकेज रेकर्ड!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"उपयोग: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs प्याकेज फाइलहरू क्रमबद्ध गर्ने साधारण उपकरण हो । -s विकल्प कस्तो खालको "
-"फाइल हो भनी इंकित गर्न प्रयोग गरिन्छ ।\n"
-"\n"
-"विकल्पहरू:\n"
-"  -h   यो मद्दत पाठ\n"
-"  -s   क्रमबद्ध स्रोत फाइल प्रयोग गर्नुहोस्\n"
-"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "पाइपहरू सिर्जना गर्न असफल"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "gzip कार्यन्वयन गर्न असफल"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "संग्रह दूषित भयो"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "अवैध संग्रह हस्ताक्षर"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि "
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "अवैध संग्रह सदस्य हेडर"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "अवैध संग्रह सदस्य हेडर"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "संग्रह अति छोटो छ"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "संग्रह हेडरहरू पढ्न असफल"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "अहिलेसम्म लिङ्क गरिएको नोडमा बोलाइएको ड्रपनोड"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "ह्यास तत्व तोक्न असफल भयो"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "मोड बाँड्न असफल भयो"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "थपमोडमा आन्तरिक त्रुटि"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "मोड अधिलेखन गर्ने प्यास गरिदै, %s -> %s र %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "मोडको डबल थप %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "नक्कली कनफिगगरेसन फाइल %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "फाइल %s लेख्न असफल भयो"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "%s फाइल बन्द गर्न असफल भयो"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "बाटो %s अति लामो छ "
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "एक भन्दा बढी %s अनप्याक गरिदैछ"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "डाइरेक्ट्री %s फेरियो "
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "प्याकेज लक्षित मोडमा लेख्ने प्यास गर्दैछ %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "घुम्ती बाटो अति लामो छ"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr " %s स्थिर गर्न असफल"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "डाइरेक्ट्री %s डाइरेक्ट्री विहिन द्वारा बदलिदैछ"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "यसको ह्यास बाल्टीमा नोड स्थित गर्न असफल भयो"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "बाटो अति लामो छ"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s स्थिर गर्न असक्षम भयो"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "फाइल %s लेख्न असफल भयो"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "%s फाइल बन्द गर्न असफल भयो"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "यो वैध DEB संग्रह होइन, '%s' सदस्य हराइरहेछ"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन  %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "एउटा खाली फाइल mmap बनाउन सकिएन"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "अवैध संग्रह हस्ताक्षर"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "%s को लागि पाइप खोल्न सकिएन"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि "
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "%lu बाइटहरुको mmap बनाउन सकिएन"
+msgid "Invalid archive member header %s"
+msgstr "अवैध संग्रह सदस्य हेडर"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "%s खोल्न असफल"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "अवैध संग्रह सदस्य हेडर"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "आह्वान गर्न असक्षम भयो"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "संग्रह अति छोटो छ"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "%lu बाइटहरुको mmap बनाउन सकिएन"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "संग्रह हेडरहरू पढ्न असफल"
 
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "फाइल %s लेख्न असफल भयो"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "पाइपहरू सिर्जना गर्न असफल"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "gzip कार्यन्वयन गर्न असफल"
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "संग्रह दूषित भयो"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "%s स्थिर गर्न असक्षम भयो ।"
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%limin %lis"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Selection %s not found"
-msgstr "चयन %s फेला पार्न सकिएन"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "नचिनिएको टाइप संक्षिप्त रुप: '%c'"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "वाक्य संरचना त्रुटि %s:%u: बन्द कुनै नाम बिना सुरू हुन्छ ।"
-
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "वाक्य संरचना त्रुटि %s:%u: वैरुप गरिएको ट्याग"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "वाक्य संरचना त्रुटि %s:%u: मान पछाडि अतिरिक्त जंक"
-
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
+msgid "Packaging system '%s' is not supported"
+msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "वाक्य संरचना त्रुटि %s:%u: अति धेरै नेस्टेड समावेश गर्दछ"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "वाक्य संरचना त्रुटि %s:%u: यहाँ बाट समावेश गरेको"
+msgid "Wrote %i records.\n"
+msgstr "%i रेकर्डहरू लेखियो ।\n"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "वाक्य संरचना त्रुटि %s:%u: समर्थन नभएको डाइरेक्टिभ '%s'"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... त्रुटि!"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... गरियो"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... गरियो"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "आदेश लाइन विकल्प '%c' [%s बाट] ज्ञात छैन ।"
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "आदेश लाइन विकल्प %s बुझिएन"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "आदेश लाइन विकल्प %s बूलियन छैन"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "विकल्प %s लाई एउटा तर्कको आवश्यकता पर्दछ ।"
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "विकल्प %s: कनफिगरेसन वस्तु विशिष्टिकरण संग एउटा =<val> हुनुपर्छ ।"
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "विकल्प  %s लाई एउटा इन्टिजर तर्कको आवश्यक पर्दछ, '%s' होइन"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "विकल्प '%s' अति लामो छ"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "अर्थ %s बुझिएन, सत्य वा झूठो प्रयास गर्नुहोस् ।"
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "अवैध सञ्चालन  %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "माउन्ट बिन्दु %s स्थिर गर्न असक्षम"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "सिडी रोम स्थिर गर्न असफल भयो"
-
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "फाइल बन्द गर्दा समस्या"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "ताल्चा प्राप्त गर्न सकिएन %s"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgid "Hash mismatch for: %s"
+msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
+msgid "The method driver %s could not be found."
+msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)"
+msgid "Is the package %s installed?"
+msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो"
+msgid "Method %s did not start correctly"
+msgstr "विधि %s सही रुपले सुरू हुन सकेन"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Could not open file %s"
-msgstr "फाइल %s खोल्न सकिएन"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "%s को लागि पाइप खोल्न सकिएन"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो"
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन "
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "फाइल बन्द गर्दा समस्या"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "फाइल गुप्तिकरण गर्दा समस्या"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "फाइल अनलिङ्क गर्दा समस्या"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।"
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "फाइल गुप्तिकरण गर्दा समस्या"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "स्थापना परित्याग गरिदैछ ।"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "खाली प्याकेज क्यास"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "प्याकेज क्यास फाइल दूषित भयो "
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "प्याकेज क्यास फाइल दूषित भयो "
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "यो APT ले संस्करण प्रणालीलाई समर्थन गर्दैन '%s'"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "आधारित"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "पुन:आधारित"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "सुझाव दिन्छ"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "सिफारिस गर्दछ"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "द्वन्दहरू"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "बदल्छ"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "वेकायमहरू"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "महत्वपूर्ण"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "आवश्यक"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "मानक"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "वैकल्पिक"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "अतिरिक्त"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "निर्भरता ट्री निर्माण गरिदैछ"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "उमेद्वार संस्करणहरू"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "निर्भरता सिर्जना"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-#, fuzzy
-msgid "Reading state information"
-msgstr "उपलब्ध सूचना गाँभिदैछ"
-
-#: apt-pkg/depcache.cc:244
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s खोल्न असफल"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "फाइल %s लेख्न असफल भयो"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "%s खोलिदैछ"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।"
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "फाइल %s खोल्न सकिएन"
-
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"द्वन्द/पुन-आधारित लूपको कारणले गर्दा स्थापना चलाउनको लागि अस्थायी रुपमा प्याकेज %s "
-"हटाउनु पर्नेछ । यो प्राय नराम्रो हो, तर यदि तपाईँ यो साँच्चै गर्न चाहनुहुन्छ भने, APT::"
-"Force-LoopBreak विकल्प सक्रिय गर्नुहोस् ।"
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।"
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको "
-"कारणले गर्दा हो ।"
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।"
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।"
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ (%s बाँकी छ)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "विधि %s सही रुपले सुरू हुन सकेन"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s स्थिर गर्न असक्षम भयो ।"
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।"
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "पिन टाइप %s बुझ्न सकिएन "
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "प्याकेज सूचिहरू पढिदैछ"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %s मा लेख्न असक्षम"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।"
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "साइज मेल खाएन"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "अवैध सञ्चालन  %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3029,12 +2192,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3043,105 +2206,165 @@ msgstr ""
 "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
 "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "बिक्रता ब्ल्क %s ले कुनै औठाछाप समाविष्ट गर्दैन"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
+msgid "List directory %spartial is missing."
+msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
+msgid "Archives directory %spartial is missing."
+msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।"
+
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
 
-#: apt-pkg/indexrecords.cc:112
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ (%s बाँकी छ)"
+
+#: apt-pkg/acquire.cc:901
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो "
+"एउटा प्रयोग गरियो ।"
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "पिन टाइप %s बुझ्न सकिएन "
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
+msgid "Could not configure '%s'. "
+msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "बिक्रता ब्ल्क %s ले कुनै औठाछाप समाविष्ट गर्दैन"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"द्वन्द/पुन-आधारित लूपको कारणले गर्दा स्थापना चलाउनको लागि अस्थायी रुपमा प्याकेज %s "
+"हटाउनु पर्नेछ । यो प्राय नराम्रो हो, तर यदि तपाईँ यो साँच्चै गर्न चाहनुहुन्छ भने, APT::"
+"Force-LoopBreak विकल्प सक्रिय गर्नुहोस् ।"
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।"
+
+#: apt-pkg/cdrom.cc:571
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "सिडी रोम अनमाउन्ट गरिदैछ..."
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "सिडी रोम अनमाउन्ट गरिदैछ\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "डिस्को लागि पर्खिदै...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "सिडी रोम माउन्ट गरिदै...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "परिचय गराइदैछ.."
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "परिचय गराइदैछ..."
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "सिडी रोम अनमाउन्ट गरिदैछ..."
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "अनुक्रमणिका फाइलहरुको लागि डिस्क स्क्यान गरिदैछ...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr " %i प्याकेज अनुक्रमणिकाहरू, %i स्रोत अनुक्रमणिका र %i  हस्ताक्षरहरू फेला परे\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "त्यो वैध नाम होइन, फेरी प्रयास गर्नुहोस् ।\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3150,302 +2373,1112 @@ msgstr ""
 "यो डिस्कको नाम:\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "प्यकेज सूचिहरू प्रतिलिपी गरिदैछ..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "नयाँ स्रोत सूचि लेखिदैछ\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i रेकर्डहरू लेखियो ।\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको "
+"कारणले गर्दा हो ।"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "निर्भरता ट्री निर्माण गरिदैछ"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "उमेद्वार संस्करणहरू"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "निर्भरता सिर्जना"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "उपलब्ध सूचना गाँभिदैछ"
+
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "MD5Sum मेल भएन"
+msgid "Failed to open StateFile %s"
+msgstr "%s खोल्न असफल"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "फाइल %s लेख्न असफल भयो"
+
+#: apt-pkg/tagfile.cc:140
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
+
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
+
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
+
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो "
-"एउटा प्रयोग गरियो ।"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s खोलिदैछ"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr " %s कनफिगर गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr " %s हटाइदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr " %s तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s अनप्याक गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr " %s कनफिगर गर्न तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr " %s हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr " %s हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr " %s मा लेख्न असक्षम"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "चयन %s फेला पार्न सकिएन"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "ताल्चा प्राप्त गर्न सकिएन %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "फाइल बन्द गर्दा समस्या"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "फाइल %s खोल्न सकिएन"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "%s को लागि पाइप खोल्न सकिएन"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो"
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन "
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "फाइल बन्द गर्दा समस्या"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "फाइल गुप्तिकरण गर्दा समस्या"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "फाइल अनलिङ्क गर्दा समस्या"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "फाइल गुप्तिकरण गर्दा समस्या"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... त्रुटि!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... गरियो"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... गरियो"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "एउटा खाली फाइल mmap बनाउन सकिएन"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "%s को लागि पाइप खोल्न सकिएन"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "%lu बाइटहरुको mmap बनाउन सकिएन"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "%s खोल्न असफल"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "आह्वान गर्न असक्षम भयो"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "%lu बाइटहरुको mmap बनाउन सकिएन"
+
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "फाइल %s लेख्न असफल भयो"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "माउन्ट बिन्दु %s स्थिर गर्न असक्षम"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "सिडी रोम स्थिर गर्न असफल भयो"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "नचिनिएको टाइप संक्षिप्त रुप: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "वाक्य संरचना त्रुटि %s:%u: बन्द कुनै नाम बिना सुरू हुन्छ ।"
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "वाक्य संरचना त्रुटि %s:%u: वैरुप गरिएको ट्याग"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "वाक्य संरचना त्रुटि %s:%u: मान पछाडि अतिरिक्त जंक"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "वाक्य संरचना त्रुटि %s:%u: अति धेरै नेस्टेड समावेश गर्दछ"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "वाक्य संरचना त्रुटि %s:%u: यहाँ बाट समावेश गरेको"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "वाक्य संरचना त्रुटि %s:%u: समर्थन नभएको डाइरेक्टिभ '%s'"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "स्थापना परित्याग गरिदैछ ।"
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "आदेश लाइन विकल्प '%c' [%s बाट] ज्ञात छैन ।"
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "आदेश लाइन विकल्प %s बुझिएन"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "आदेश लाइन विकल्प %s बूलियन छैन"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "विकल्प %s लाई एउटा तर्कको आवश्यकता पर्दछ ।"
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "विकल्प %s: कनफिगरेसन वस्तु विशिष्टिकरण संग एउटा =<val> हुनुपर्छ ।"
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "विकल्प  %s लाई एउटा इन्टिजर तर्कको आवश्यक पर्दछ, '%s' होइन"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "विकल्प '%s' अति लामो छ"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "अर्थ %s बुझिएन, सत्य वा झूठो प्रयास गर्नुहोस् ।"
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "अवैध सञ्चालन  %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
+"\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h   यो मद्दत पाठ\n"
+"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
+"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s स्थिर गर्न असक्षम भयो"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "प्याकेज विस्तार सूचि अति लामो छ"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "स्रोत विस्तार सूचि अति लामो छ"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"उपयोग: apt-ftparchive [विकल्पहरू] आदेश\n"
+"आदेशहरू: 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 ले डेवियन संग्रहहरुको लागि अनुक्रमणिका फाइलहरू सिर्जना गर्दछ । यसले "
+"समर्थन गर्दछ\n"
+"dpkg-scanpackages र dpkg-scansources को लागि कार्यात्मक प्रतिस्थापनमा पुरै "
+"स्वचालितबाट सिर्जनाको धेरै शैलीहरू\n"
+" \n"
+"\n"
+"apt-ftparchive ले debs को ट्रीबाट प्याकेज फाइलहरू सिर्जना गर्दछ । प्याकेज\n"
+"फाइलहरुले प्रत्येक प्याकेजबाट सबै नियन्त्रण फाँटहरुको सामग्रीहरू साथ साथै MD5 hash र "
+"filesize समावेश गर्दछ ।\n"
+"एउटा अधिलेखन फाइल\n"
+"प्राथमिकता र सेक्सनको मान जोड गर्न समर्थित हुन्छ ।\n"
+"\n"
+"त्यस्तै गरी apt-ftparchive ले .dscs को ट्रीबाट स्रोत फाइलहरू सिर्जना गर्दछ ।\n"
+"स्रोत--अधिलेखन--विकल्प src अधीलेखन फाइल निर्दिष्ट गर्न प्रयोग गर्न सकिन्छ\n"
+"\n"
+"'packages' and 'sources' आदेश ट्रीको मूलमा चलाउन सकिन्छ ।\n"
+" विनारी मार्ग फेरी हुने खोजीको विन्दुमा आधारित हुन्छ र \n"
+"अधिलेखन फाइलले अधिलेखन झण्डाहरू समाविष्ट गर्दछ । यदि उपस्थित छ भने बाटो उपसर्ग\n"
+"फाइलनाम फाँटहरुमा थपिन्छ । उदाहरणको लागि \n"
+"डेवियन संग्रहबाट उपयोग:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h    यो मद्दत पाठ\n"
+"  --md5 नियन्त्रण MD5 सिर्जना\n"
+"  -s=?  स्रोत अधिलेखन फाइल\n"
+"  -q    बन्द गर्नुहोस्\n"
+"  -d=?  वैकल्पिक क्यासिङ डेटाबेस चयन गर्नुहोस्\n"
+"  --no-delink delinking डिबग मोड सक्षम गर्नुहोस्\n"
+"  --सामग्रीहरू  सामग्री फाइल सिर्जना नियन्त्रण गर्नुहोस्\n"
+"  -c=?  यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=?  एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "कुनै चयनहरू मेल खाएन"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "DB फाइल %s असक्षम भयो: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: %s स्थिर गर्न असक्षम\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्"
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "%s हल गर्न असफल भयो"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "ट्री हिडाईँ असफल भयो"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s खोल्न असफल"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "लिङ्क पढ्न असफल %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "अनलिङ्क गर्न असफल %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s मा %s लिङ्क असफल भयो"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s संभारकर्ता %s हो %s होइन\n"
+
+#: ftparchive/writer.cc:721
+#, fuzzy, c-format
+msgid "  %s has no source override entry\n"
+msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
+
+#: ftparchive/writer.cc:725
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s खोल्न असफल"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "अधिलेखन फाइल पढ्न असफल %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #२"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #३"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "FILE* सिर्जना गर्न असफल"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "काँटा गर्न असफल"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "सङ्कुचन शाखा"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "MD5 गणना गर्दा पढ्न असफल भयो"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "समस्या अनलिङ्क भइरहेछ %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
+"\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h   यो मद्दत पाठ\n"
+"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
+"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "अज्ञात प्याकेज रेकर्ड!"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs प्याकेज फाइलहरू क्रमबद्ध गर्ने साधारण उपकरण हो । -s विकल्प कस्तो खालको "
+"फाइल हो भनी इंकित गर्न प्रयोग गरिन्छ ।\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h   यो मद्दत पाठ\n"
+"  -s   क्रमबद्ध स्रोत फाइल प्रयोग गर्नुहोस्\n"
+"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s वैध DEB प्याकेज होइन"
 
diff --git a/po/nl.po b/po/nl.po
index dd7fe40f3..c6c1183d8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.15.9\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2011-12-05 17:10+0100\n"
 "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -21,152 +21,153 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Totaal aantal pakketnamen: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Totaal aantal pakketstructuren: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Normale pakketten: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr " Zuiver virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Losstaande virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Gemengde virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Ontbrekend: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Totaal aantal verschillende versies: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Totaal aantal verschillende beschrijvingen: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Totaal aantal vereisten: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Totaal aantal versie/bestand-relaties: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Totaal aantal Beschrijving/bestand-relaties: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Totaal aantal 'Voorziet'-toewijzingen "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Totaal aantal geglobde strings: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Totale hoeveelheid vereisten-versieruimte: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Totale onbenutte ruimte: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Totale hoeveelheid verantwoorde ruimte: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Geen pakketten gevonden"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "U dient precies één zoekpatroon op te geven"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kan pakket %s niet vinden"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Pakketbestanden:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cache loopt niet synchroon, kan pakketbestand niet 'x-ref'-en"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Vastgepinde pakketten:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(niet gevonden)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Geïnstalleerd: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Kandidaat: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(geen)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Pakketpin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Versietabel:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -240,30 +241,30 @@ msgstr ""
 "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp.\n"
 "Zie de man-pagina's van apt-cache(8) en apt.conf(5) voor meer informatie.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Gelieve een naam voor deze schijf op te geven, bijvoorbeeld 'Debian 5.0.3 "
 "Schijf 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Gelieve een schijf in het station te plaatsen en op 'enter' te drukken"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Aankoppelen van '%s' op '%s' is mislukt"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Dit proces dient herhaald te worden voor alle CD's in uw set."
 
@@ -300,67 +301,67 @@ msgstr ""
 "  -c=? Lees dit configuratiebestand.\n"
 "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Kon geen enkel pakket vinden bij regex '%s'"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Kon geen enkel pakket vinden bij regex '%s'"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Kon geen enkel pakket vinden bij regex '%s'"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "'%s' wordt genomen als bronpakket in plaats van '%s'\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Negeer niet beschikbare versie '%s' van pakket '%s'"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kon pakket %s niet vinden"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s is ingesteld voor handmatige installatie.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s is ingesteld op automatische geïnstalleerd.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Kon de ophaalmap niet vergrendelen"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kan geen bronpakket vinden voor %s"
@@ -387,97 +388,97 @@ msgstr ""
 "om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op "
 "te halen.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "U heeft niet voldoende vrije schijfruimte op %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Moet %sB aan bronarchieven ophalen.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Ophalen bron %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Ophalen van sommige archieven is mislukt."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uitpakopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Bouwopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Dochterproces is mislukt"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s heeft geen bouwvereisten.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -486,7 +487,7 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -495,14 +496,14 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -511,7 +512,7 @@ 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:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -520,30 +521,30 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bouwvereisten voor %s konden niet voldaan worden."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Verwerken van de bouwvereisten is mislukt"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Er wordt verbinding gemaakt met %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -632,53 +633,76 @@ msgstr ""
 "voor meer informatie en opties.\n"
 "                       Deze APT heeft Super Koe kracht.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
+"worden"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "maar het is niet geïnstalleerd"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s is ingesteld voor handmatige installatie.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s is ingesteld op automatische geïnstalleerd.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s is reeds de nieuwste versie.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s is reeds de nieuwste versie.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Er is gewacht op %s, maar die kwam niet"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s is ingesteld voor handmatige installatie.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Openen van %s is mislukt"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -705,7 +729,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -754,52 +778,52 @@ msgstr ""
 msgid "Disk not found."
 msgstr "Schijf niet gevonden"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Bestand niet gevonden"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "stat is mislukt"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Instellen van de aanpassingstijd is mislukt"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ongeldige URI, lokale URIs mogen niet beginnen met //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Bezig met aanmelden"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Kan de 'peer'-naam niet bepalen"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Kan de lokale naam niet bepalen"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Onze verbinding is door de server geweigerd met bericht: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER mislukt; bericht van server: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS mislukt; bericht van server: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -807,121 +831,123 @@ msgstr ""
 "Er was een proxy-server opgegeven, maar geen aanmeldscript, Acquire::ftp::"
 "ProxyLogin is leeg."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Aanmeldscriptopdracht '%s' is mislukt; bericht van server: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislukt; bericht van server: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Verbinding is verlopen"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Verbinding is verbroken door de server"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Leesfout"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Een reactie deed de buffer overlopen"
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Protocolcorruptie"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Schrijffout"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Kon geen socket aanmaken"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kon de datasocket niet verbinden, de verbinding verliep"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Mislukt"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Kon de passieve socket niet verbinden."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo kon geen luistersocket verkrijgen"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Kon geen socket binden"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Kon niet op de socket niet luisteren"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Kon de socketnaam niet bepalen"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Kan PORT-commando niet verzenden"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Onbekende adresfamilie %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT is mislukt; bericht van server: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Datasocket verbinding is verlopen"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Kan de verbinding niet aanvaarden"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Probleem bij het hashen van het bestand"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kan bestand niet ophalen; bericht van server: %s"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Datasocket verliep"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Data transfer is mislukt, server zei: %s"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Zoekopdracht"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Aanroepen mislukt van "
 
@@ -957,7 +983,7 @@ msgstr "Kon niet verbinden met %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Er wordt verbinding gemaakt met %s"
@@ -987,40 +1013,40 @@ msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Kan geen verbinding maken met %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Er is tenminste één ongeldige ondertekening gevonden."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kon 'gpgv' niet uitvoeren om ondertekening te verifiëren (is gpgv "
 "geïnstalleerd?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Onbekende fout bij het uitvoeren van gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "De volgende ondertekeningen waren ongeldig:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1028,151 +1054,385 @@ msgstr ""
 "De volgende ondertekeningen konden niet geverifieerd worden omdat de "
 "publieke sleutel niet beschikbaar is:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Fout bij het schrijven naar het bestand"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 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:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Fout bij het lezen van de server"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Fout bij het schrijven naar bestand"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Selectie is mislukt"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Verbinding verliep"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Fout bij het schrijven naar het uitvoerbestand"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Wachtend op de kopteksten"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Foute koptekstregel"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Onbekend datumformaat"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Foute koptekstdata"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Opwaardering wordt doorgerekend... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Klaar"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Vereisten worden gecorrigeerd..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislukt."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Kan vereisten niet corrigeren"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Klaar"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Geïnstalleerd]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Geïnstalleerd]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Geïnstalleerd]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Geïnstalleerd]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "De volgende pakketten hebben niet-voldane vereisten:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "maar %s is geïnstalleerd"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "maar %s zal geïnstalleerd worden"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "maar het is niet installeerbaar"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "maar het is een virtueel pakket"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "maar het is niet geïnstalleerd"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "maar het zal niet geïnstalleerd worden"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " of"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "De volgende pakketten zullen VERWIJDERD worden:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "De volgende pakketten zijn achtergehouden:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "De volgende pakketten zullen opgewaardeerd worden:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (vanwege %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n"
+"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu opnieuw geïnstalleerd, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu gedegradeerd, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex-compilatiefout - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "De opdracht 'update' aanvaard geen argumenten"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interne fout, rangschikken is niet voltooid"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Er moeten %sB aan archieven opgehaald worden.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "U heeft onvoldoende vrije schijfruimte op %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Ja, doe wat ik zeg!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1183,19 +1443,19 @@ msgstr ""
 "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Afbreken."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Wilt u doorgaan?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Ophalen van sommige bestanden is mislukt"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1203,19 +1463,19 @@ msgstr ""
 "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --"
 "fix-missing proberen?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Geen oplossing voor de missende pakketten gevonden."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Installatie wordt afgebroken."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1229,15 +1489,15 @@ msgstr[1] ""
 "De volgende pakketten zijn van uw systeem verdwenen omdat\n"
 "alle bestanden zijn overschreven door andere pakketten:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Let op: Dit wordt automatische en bewust door dpkg gedaan."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1255,15 +1515,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "De volgende informatie helpt u mogelijk verder:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1275,7 +1535,7 @@ msgstr[1] ""
 "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
 "nodig:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1284,20 +1544,20 @@ msgstr[0] "%lu pakket is automatisch geïnstalleerd en is niet langer nodig.\n"
 msgstr[1] ""
 "%lu pakketten zijn automatisch geïnstalleerd en zijn niet langer nodig.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "U kunt deze verwijderen via 'apt-get autoremove'."
 msgstr[1] "U kunt deze verwijderen via 'apt-get autoremove'."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1305,7 +1565,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)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1316,323 +1576,97 @@ msgstr ""
 "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
 "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Niet-werkende pakketten:"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Voorgestelde pakketten:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Aanbevolen pakketten:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"OPMERKING: Dit is een simulatie!\n"
+"    Voor daadwerkelijke uitvoering heeft apt-get beheerdersrechten nodig.\n"
+"    Houd er ook rekening mee ook dat vergrendeling is uitgeschakeld en\n"
+"    vertrouw dus niet op de relevantie voor de werkelijke huidige situatie!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 "WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Authentificatiewaarschuwing is genegeerd.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Sommige pakketten konden niet geauthentificeerd worden"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Wilt u deze pakketten installeren zonder verificatie?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ophalen van %s is mislukt  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Geïnstalleerd]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Geïnstalleerd]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Geïnstalleerd]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Geïnstalleerd]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "De volgende pakketten hebben niet-voldane vereisten:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "maar %s is geïnstalleerd"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "maar %s zal geïnstalleerd worden"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "maar het is niet installeerbaar"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "maar het is een virtueel pakket"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "maar het is niet geïnstalleerd"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "maar het zal niet geïnstalleerd worden"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " of"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "De volgende pakketten zullen VERWIJDERD worden:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "De volgende pakketten zijn achtergehouden:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "De volgende pakketten zullen opgewaardeerd worden:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (vanwege %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n"
-"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu opnieuw geïnstalleerd, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu gedegradeerd, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex-compilatiefout - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Vereisten worden gecorrigeerd..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " mislukt."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Kan vereisten niet corrigeren"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Klaar"
-
-#: apt-private/private-cachefile.cc:102
-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."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "De opdracht 'update' aanvaard geen argumenten"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Opwaardering wordt doorgerekend... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Klaar"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"OPMERKING: Dit is een simulatie!\n"
-"    Voor daadwerkelijke uitvoering heeft apt-get beheerdersrechten nodig.\n"
-"    Houd er ook rekening mee ook dat vergrendeling is uitgeschakeld en\n"
-"    vertrouw dus niet op de relevantie voor de werkelijke huidige situatie!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Hernoemen van %s naar %s is mislukt"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Geraakt "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Ophalen:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Genegeerd "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Fout "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%sB opgehaald in %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Bezig]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1645,19 +1679,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kan %s niet lezen"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kan %s niet veranderen"
@@ -1686,11 +1720,11 @@ msgstr "Geen spiegelbestand '%s' gevonden "
 msgid "[Mirror: %s]"
 msgstr "[Spiegelserver: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Aanmaken van IPC-pijp naar subproces is mislukt"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Verbinding werd voortijdig afgebroken"
 
@@ -1735,1376 +1769,485 @@ msgstr ""
 msgid "Merging available information"
 msgstr "De beschikbare informatie wordt samengevoegd"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n"
-"\n"
-"apt-extracttemplates is een programma om configuratie- en "
-"sjablooninformatie\n"
-"uit Debian pakketten te halen.\n"
-"\n"
-"Opties:\n"
-"  -h     Deze hulptekst.\n"
-"  -t      Stel de tijdelijke map in.\n"
-"  -c=? Lees dit configuratiebestand.\n"
-"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kan niet naar %s schrijven"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Pakket-extensielijst is te lang"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Fout bij het verwerken van map %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Bron-extensielijst is te lang"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Fout bij het verwerken van de inhoud van %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Gebruik: apt-ftparchive [opties] commando\n"
-"Opdrachten: packages <pad naar .deb's> [voorrangsbestand [padprefix]]\n"
-"            sources <pad naar .dsc's> [voorrangsbestand [padprefix]]\n"
-"            contents <pad>\n"
-"            release <pad>\n"
-"            generate config [groepen]\n"
-"            clean config\n"
-"\n"
-"Met apt-ftparchive genereert u index bestanden voor Debian archieven.\n"
-"Het ondersteunt verschillende generatiestijlen variërend van volledig \n"
-"automatisch tot een functionele vervanging van dpkg-scanpackages en \n"
-"dpkg-scansources\n"
-"\n"
-"apt-ftparchive genereert pakketbestanden van een boom met .debs.\n"
-"Het 'Packages'-bestand bevat de inhoud van alle 'control'-velden van elk\n"
-"pakket alsook de MD5 hash en de bestandsgrootte. Via een voorrangsbestand\n"
-"kunnen de waardes van de 'Priority'- en 'Section'-velden afgedwongen\n"
-"worden.\n"
-"\n"
-"Op overeenkomstige wijze genereert apt-ftparchive de 'Sources'-bestanden\n"
-"van een boom met .dscs. De '--source-override'-optie kan gebruikt worden\n"
-"om een voorrangsbestand voor bronpakketten te specificeren.\n"
-"\n"
-"De 'packages' en 'sources' opdrachten dienen uitgevoerd te worden \n"
-"in de basismap van de boom. Het pad naar de .deb's dient te verwijzen naar\n"
-"het startpunt van de recursieve zoekopdracht en een voorrangsbestand dient\n"
-"de voorrangsvlaggen te bevatten. Padprefix wordt toegevoegd aan het\n"
-"'filename'-veld indien dit aanwezig is. Enkele voorbeelden uit het debian\n"
-"archief:\n"
-"            apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"            dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opties:\n"
-"  -h          Deze hulptekst\n"
-"  --md5       Beheer de MD5 generatie\n"
-"  -s=?        Bronvoorrangsbestand\n"
-"  -q          Stille uitvoer\n"
-"  -d=?        Selecteert de optionele caching database\n"
-"  --no-delink Schakelt de ontlinking debug modus in\n"
-"  --contents  Beheer de generatie van het inhoudsbestand\n"
-"  -c=?        Lees dit configuratiebestand in\n"
-"  -o=?        Stel een willekeurige configuratie optie in"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Geen van de selecties kwam overeen"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB is beschadigd, bestand hernoemd naar %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie van "
-"apt, dient u de database te verwijderen en opnieuw aan te maken."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Kan het DB-bestand %s niet openen: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "stat op %s is mislukt"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Archief heeft geen 'control'-record"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Kan geen cursor verkrijgen"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Kon map %s niet lezen\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Kon de status van %s niet opvragen\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "F: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "F: Er zijn fouten van toepassing op het bestand "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Oplossen van %s is mislukt"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Doorlopen boomstructuur is mislukt"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Openen van %s is mislukt"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " OntlLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink op %s is mislukt"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Ontlinken van %s is mislukt"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Linken van %s aan %s is mislukt"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Ontlinklimiet van %sB bereikt.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Archief heeft geen 'package'-veld"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s heeft geen voorrangsingang\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s beheerder is %s, niet %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Geheugentoewijzing is mislukt"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Kan %s niet openen"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Misvormde voorrangsingang %s op regel %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Lezen van het voorrangsbestand %s is mislukt"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Misvormde voorrangsingang %s op regel %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Misvormde voorrangsingang %s op regel %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Misvormde voorrangsingang %s op regel %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Onbekend compressie-algoritme '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Gecomprimeerde uitvoer %s vereist een compressieset"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Aanmaken van FILE* is mislukt"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Vorken van proces is mislukt"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Comprimeer kind"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Interne fout, aanmaken van %s is mislukt"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "IO naar subproces/bestand is mislukt"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Lezen tijdens het berekenen van de MD5 is mislukt"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Probleem bij het ontlinken van %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Hernoemen van %s naar %s is mislukt"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n"
-"\n"
-"apt-extracttemplates is een programma om configuratie- en "
-"sjablooninformatie\n"
-"uit Debian pakketten te halen.\n"
-"\n"
-"Opties:\n"
-"  -h     Deze hulptekst.\n"
-"  -t      Stel de tijdelijke map in.\n"
-"  -c=? Lees dit configuratiebestand.\n"
-"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Onbekend pakketrecord!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Gebruik: apt-sortpkgs [opties] bestand1 [bestand2 ...]\n"
-"\n"
-"apt-sortpkgs is een simpel programma om pakketbestanden te sorteren.\n"
-"De -s optie wordt gebruikt om aan te geven om welk soort bestand het gaat.\n"
-"\n"
-"Opties:\n"
-"  -h    Deze helptekst\n"
-"  -s    Sorteer bronbestanden\n"
-"  -c=? Lees dit configuratiebestand\n"
-"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Aanmaken pijp is mislukt"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Uitvoeren van gzip is mislukt "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Beschadigd archief"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar controlesom klopt niet, het pakket is beschadigd"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Ongeldige archiefondertekening"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Fout bij het lezen van de koptekst van het archiefonderdeel"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ongeldige koptekst voor archiefonderdeel: %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Ongeldige koptekst in archiefonderdeel"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Archief is te kort"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Lezen van de archiefkopteksten is mislukt"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode werd aangeroepen op een nog gelinkte knoop"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Lokaliseren van het hash-element is mislukt!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Toewijzen van de omleiding is mislukt"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Interne fout in AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Er wordt gepoogd om de omleiding %s->%s en %s/%s te overschrijven"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dubbele toevoeging van de omleiding %s->%s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Dubbel configuratiebestand %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Wegschrijven van bestand %s is mislukt"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Sluiten van bestand %s is mislukt"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Het pad %s is te lang"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s wordt meer dan eens uitgepakt"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "De map %s is al omgeleid"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Het pakket probeert om het omleidingsdoel %s/%s weg te schrijven"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Het omleidingspad is te lang"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "stat op %s is mislukt"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Hernoemen van %s naar %s is mislukt"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "De map %s wordt vervangen door een niet-map"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Vinden van de knoop in de hash-emmer is mislukt"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Het pad is te lang"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Pakket-overeenkomst wordt overschreven met 'no version' voor %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Kan de status van %s niet opvragen"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Wegschrijven van bestand %s is mislukt"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Sluiten van bestand %s is mislukt"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Dit is geen geldig DEB-archief, het onderdeel '%s' mankeert"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Interne fout, kon onderdeel %s niet vinden"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Niet-ontleedbaar 'control'-bestand"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Kan een leeg bestand niet mmappen"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Kon de bestandsindicator %i niet dupliceren"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Kon van %lu bytes geen mmap maken"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Kan mmap niet sluiten"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Kan mmap niet synchronizeren"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Kon van %lu bytes geen mmap maken"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Afkorten van bestand is mislukt"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::Cache-"
-"Start te verhogen. Huidige waarde: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Kan het formaat van de MMap niet vergroten omdat de grens van %lu bytes al "
-"is bereikt"
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Kan het formaat van de MMap niet vergroten omdat het automatisch vergroten "
-"door de gebruiker is uitgeschakeld."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %liu %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liu %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ongeldige archiefondertekening"
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Fout bij het lezen van de koptekst van het archiefonderdeel"
 
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Selection %s not found"
-msgstr "Selectie %s niet gevonden"
+msgid "Invalid archive member header %s"
+msgstr "Ongeldige koptekst voor archiefonderdeel: %s"
 
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Onbekende type-afkorting '%c'"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ongeldige koptekst in archiefonderdeel"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Configuratiebestand %s wordt geopend"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Archief is te kort"
 
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Syntaxfout %s:%u: Blok start zonder naam."
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Lezen van de archiefkopteksten is mislukt"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Aanmaken pijp is mislukt"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Syntaxfout %s:%u: Extra rommel na waarde"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Uitvoeren van gzip is mislukt "
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Beschadigd archief"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar controlesom klopt niet, het pakket is beschadigd"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'"
+msgid "Unable to stat %s."
+msgstr "Kan de status van %s niet opvragen."
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Syntaxfout %s:%u: De richtlijn 'clear' vereist een optieboom als argument"
 
-#: apt-pkg/contrib/configuration.cc:934
-#, 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"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Fout!"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "dpkg wordt uitgevoerd"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Klaar"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Klaar"
+msgid "Packaging system '%s' is not supported"
+msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
 
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Commandoregel-optie '%c' [van %s] is onbekend."
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Kan geen geschikt pakketsysteemtype bepalen"
 
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Command line option %s is not understood"
-msgstr "Commandoregel-optie %s wordt niet begrepen"
+msgid "Wrote %i records.\n"
+msgstr "%i records weggeschreven.\n"
 
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Commandoregel-optie %s is niet booleaans"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i records weggeschreven met %i missende bestanden.\n"
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Optie %s vereist een argument."
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n"
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"Optie %s: De specificatie van het configuratie-item dient een =<waarde> te "
-"bevatten."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Optie %s vereist een integer getal als argument, niet '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Optie '%s' is te lang"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Waarde %s wordt niet begrepen, probeer 'true' of 'false'."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Ongeldige operatie %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Kan de status van het aanhechtpunt %s niet opvragen"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "stat op de CD-ROM is mislukt"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Probleem bij het afsluiten van het gzip-bestand %s"
+"%i records weggeschreven met %i missende bestanden en %i niet overeenkomende "
+"bestanden\n"
 
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-"Er wordt geen vergrendeling gebruikt voor het alleen-lezen-"
-"vergrendelingsbestand %s"
+msgid "Can't find authentication record for: %s"
+msgstr "Kan geen authenticatierecord vinden voor: %s"
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open lock file %s"
-msgstr "Kon het vergrendelingsbestand '%s' niet openen"
+msgid "Hash mismatch for: %s"
+msgstr "Hash-som komt niet overeen voor: %s"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld"
+msgid "The method driver %s could not be found."
+msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
 
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Kon vergrendeling %s niet verkrijgen"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgid "Method %s did not start correctly"
+msgstr "Methode %s startte niet op de juiste manier"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+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/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
+"De pakketlijsten of het statusbestand konden of niet ontleed, of niet "
+"geopend worden."
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:98
+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/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Subproces %s ontving een segmentatiefout."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Subproces %s ontving signaal %u."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Subproces %s gaf de foutcode %u terug"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Subproces %s sloot onverwacht af"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Kon het bestand %s niet openen"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Kon de bestandsindicator %d niet openen"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Aanmaken subproces-IPC is mislukt"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Uitvoeren van de compressor is mislukt "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "schrijf, de laatste %lu konden niet weggeschreven worden"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "Probleem bij het afsluiten van het bestand %s"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Probleem bij het hernoemen van '%s' naar '%s'"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Probleem bij het ontlinken van het bestand %s"
-
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Probleem bij het synchroniseren van het bestand"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Geen sleutelring geïnstalleerd in %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "De lijst van bronnen kon niet gelezen worden."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Lege pakketcache"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Het pakketcachebestand is beschadigd"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Het pakketcachebestand heeft een niet-compatibele versie"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Het pakketcachebestand is beschadigd"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "De pakketcache was aangemaakt voor een andere architectuur"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Vereisten"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Voor-Vereisten"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Suggesties"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Aanbevelingen"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Conflicteert met"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Vervangt"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Verouderd"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Breekt"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Vult aan"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "belangrijk"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "noodzakelijk"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "standaard"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "optioneel"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Boom van vereisten wordt opgebouwd"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Kandidaat-versies"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Generatie vereisten"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "De status informatie wordt gelezen"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Openen van StateFile %s is mislukt"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Kon pakketbestand %s niet ontleden (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Kon pakketbestand %s niet ontleden (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Misvormde regel %lu in bronlijst %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Misvormde regel %lu in bronlijst %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Misvormde regel %lu in bronlijst %s (dist parse)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "%s wordt geopend"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Regel %u van de bronlijst %s is te lang."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Misvormde regel %u in bronlijst %s (type)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Kon onmiddellijke configuratie van '%s' niet uitvoeren. Voor details zie "
-"'man 5 apt.conf', onder APT::Immediate-Configure. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Kon het bestand '%s' niet openen"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Deze installatie-aanroep vereist het tijdelijk verwijderen van het "
-"essentiële pakket %s, dit omwille van een Conflicts/Pre-Depends -lus. Dit is "
-"vaak slecht, wilt u dit echt doen dan dient u de APT::Force-LoopBreak optie "
-"te activeren."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indexbestand van type '%s' wordt niet ondersteund"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor "
-"gevonden worden."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
-"veroorzaakt worden door vastgehouden pakketten."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Lijstmap %spartial is afwezig."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Archiefmap %spartial is afwezig."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Kan de map %s niet vergrendelen"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, 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:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Bestand %li van %li wordt opgehaald"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Methode %s startte niet op de juiste manier"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Kan geen geschikt pakketsysteemtype bepalen"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kan de status van %s niet opvragen."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Uw bronnenlijst (/etc/apt/sources.list) dient tenminste één bron-URI te "
-"bevatten"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"De pakketlijsten of het statusbestand konden of niet ontleed, of niet "
-"geopend worden."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "De lijst van bronnen kon niet gelezen worden."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-"Ongeldige record in het voorkeurenbestand %s, 'Package' koptekst ontbreekt"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Pintype %s wordt niet begrepen"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Fout tijdens verwerken van %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Wauw, u heeft meer pakketten dan deze APT aan kan."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Wauw, u heeft meer versies dan deze APT aan kan."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Wauw, u heeft het maximum aantal beschrijvingen dat deze APT aan kan "
 "overschreden."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aan kan."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Pakket %s %s werd niet gevonden bij het verwerken van de "
 "bestandsafhankelijkheden"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Pakketlijsten worden ingelezen"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Voorziene bestanden worden verzameld"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kan niet naar %s schrijven"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "herbenoeming is mislukt, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Hash-som komt niet overeen"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Grootte komt niet overeen"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Ongeldige operatie %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Kon Release-bestand %s niet ontleden"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3115,12 +2258,12 @@ msgstr ""
 "%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fout: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3129,12 +2272,12 @@ msgstr ""
 "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
 "dit pakket handmatig moet repareren (wegens missende architectuur)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3142,71 +2285,137 @@ msgstr ""
 "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
 "pakket %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kon Release-bestand %s niet ontleden"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Verkopersblok %s bevat geen vingerafdruk"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Geen secties in Release-bestand %s"
+msgid "List directory %spartial is missing."
+msgstr "Lijstmap %spartial is afwezig."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Geen Hash-vermelding in Release-bestand %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Archiefmap %spartial is afwezig."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Geen 'Valid-Until'-vermelding in Release-bestand %s"
+msgid "Unable to lock directory %s"
+msgstr "Kan de map %s niet vergrendelen"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Geen 'Date'-vermelding in Release-bestand %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Verkopersblok %s bevat geen vingerafdruk"
+msgid "Retrieving file %li of %li"
+msgstr "Bestand %li van %li wordt opgehaald"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er "
+"zijn oudere versies van gebruikt."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Uw bronnenlijst (/etc/apt/sources.list) dient tenminste één bron-URI te "
+"bevatten"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
+"Ongeldige record in het voorkeurenbestand %s, 'Package' koptekst ontbreekt"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Pintype %s wordt niet begrepen"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Kon onmiddellijke configuratie van '%s' niet uitvoeren. Voor details zie "
+"'man 5 apt.conf', onder APT::Immediate-Configure. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Kon het bestand '%s' niet openen"
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Deze installatie-aanroep vereist het tijdelijk verwijderen van het "
+"essentiële pakket %s, dit omwille van een Conflicts/Pre-Depends -lus. Dit is "
+"vaak slecht, wilt u dit echt doen dan dient u de APT::Force-LoopBreak optie "
+"te activeren."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Regel %u van de bronlijst %s is te lang."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD wordt afgekoppeld...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "CD wordt losgekoppeld\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Er wordt gewacht op de schijf...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "CD wordt aangekoppeld...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Identificatie..."
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Opgeslagen label: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD wordt afgekoppeld...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Er wordt gescand voor indexbestanden...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3215,7 +2424,7 @@ msgstr ""
 "Er zijn %zu pakket-indexen, %zu bron-indexen, %zu vertalingsindexen, en %zu "
 "handtekeningen gevonden\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3223,16 +2432,16 @@ msgstr ""
 "Kan geen Package-bestanden vinden. Is dit mogelijk geen Debian schijf, of de "
 "verkeerde architectuur?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Label '%s' gevonden\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3241,82 +2450,106 @@ msgstr ""
 "De schijf heet:\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Pakketlijsten worden gekopieerd..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Nieuwe bronlijst wordt weggeschreven\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i records weggeschreven.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor "
+"gevonden worden."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i records weggeschreven met %i missende bestanden.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
+"veroorzaakt worden door vastgehouden pakketten."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Boom van vereisten wordt opgebouwd"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidaat-versies"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generatie vereisten"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "De status informatie wordt gelezen"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n"
+msgid "Failed to open StateFile %s"
+msgstr "Openen van StateFile %s is mislukt"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"%i records weggeschreven met %i missende bestanden en %i niet overeenkomende "
-"bestanden\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Kan geen authenticatierecord vinden voor: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Kon pakketbestand %s niet ontleden (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash-som komt niet overeen voor: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Kon pakketbestand %s niet ontleden (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' voor '%s' is niet gevonden"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versie '%s' voor '%s' is niet gevonden"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Kon taak '%s' niet vinden"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Kon geen enkel pakket vinden bij regex '%s'"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Kon geen enkel pakket vinden bij regex '%s'"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, fuzzy, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Kan geen versies selecteren voor pakket '%s' omdat deze zuiver virtueel is"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3325,179 +2558,242 @@ msgstr ""
 "Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' "
 "selecteren omdat deze geen van beide heeft"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Kan de nieuwste versie van het pakket '%s' niet selecteren omdat deze zuiver "
 "virtueel is"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Kan de kandidaat-versie van het pakket %s niet selecteren omdat deze geen "
 "kandidaat heeft"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat deze "
 "niet geïnstalleerd is"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Kon Release-bestand %s niet ontleden"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Geen secties in Release-bestand %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Geen Hash-vermelding in Release-bestand %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Geen 'Valid-Until'-vermelding in Release-bestand %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Geen 'Date'-vermelding in Release-bestand %s"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
+
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "dpkg wordt uitgevoerd"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er "
-"zijn oudere versies van gebruikt."
+"Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Misvormde regel %lu in bronlijst %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Misvormde regel %lu in bronlijst %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Misvormde regel %lu in bronlijst %s (dist parse)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s wordt geopend"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Misvormde regel %u in bronlijst %s (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "%s wordt geïnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "%s wordt geconfigureerd"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "%s wordt verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s wordt volledig verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "De verdwijning van %s wordt opgemerkt"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Post-installatie-trigger %s wordt uitgevoerd"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Map '%s' ontbreekt"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Kon het bestand '%s' niet openen"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wordt uitgepakt"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Configuratie van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s is geïnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Verwijdering van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s is verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Volledige verwijdering van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s is volledig verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Kan niet naar %s schrijven"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen "
 "(MaxReports) al is bereikt"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemen met vereisten - wordt niet geconfigureerd"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3505,7 +2801,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een "
 "eerdere mislukking."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3513,7 +2809,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
 "over een volle schijf."
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3521,7 +2817,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
 "over onvoldoende-geheugen."
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3530,14 +2826,14 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
 "over een volle schijf."
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout over "
 "dpkg-I/O is."
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3546,24 +2842,763 @@ msgstr ""
 "Kan de beheersmap (%s) niet vergrendelen. Is deze in gebruik door een ander "
 "proces?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg werd onderbroken; voer handmatig '%s' uit om het probleem te verhelpen. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Niet vergrendeld"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %liu %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liu %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selectie %s niet gevonden"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+"Er wordt geen vergrendeling gebruikt voor het alleen-lezen-"
+"vergrendelingsbestand %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Kon het vergrendelingsbestand '%s' niet openen"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Kon vergrendeling %s niet verkrijgen"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Subproces %s ontving een segmentatiefout."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Subproces %s ontving signaal %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Subproces %s gaf de foutcode %u terug"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Subproces %s sloot onverwacht af"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Probleem bij het afsluiten van het gzip-bestand %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Kon het bestand %s niet openen"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Kon de bestandsindicator %d niet openen"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Aanmaken subproces-IPC is mislukt"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Uitvoeren van de compressor is mislukt "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "schrijf, de laatste %lu konden niet weggeschreven worden"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Probleem bij het afsluiten van het bestand %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Probleem bij het hernoemen van '%s' naar '%s'"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Probleem bij het ontlinken van het bestand %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Probleem bij het synchroniseren van het bestand"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Fout!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Klaar"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Klaar"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Kan een leeg bestand niet mmappen"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Kon de bestandsindicator %i niet dupliceren"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Kon van %lu bytes geen mmap maken"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Kan mmap niet sluiten"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Kan mmap niet synchronizeren"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Kon van %lu bytes geen mmap maken"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Afkorten van bestand is mislukt"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::Cache-"
+"Start te verhogen. Huidige waarde: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Kan het formaat van de MMap niet vergroten omdat de grens van %lu bytes al "
+"is bereikt"
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Kan het formaat van de MMap niet vergroten omdat het automatisch vergroten "
+"door de gebruiker is uitgeschakeld."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Kan de status van het aanhechtpunt %s niet opvragen"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "stat op de CD-ROM is mislukt"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Onbekende type-afkorting '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Configuratiebestand %s wordt geopend"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaxfout %s:%u: Extra rommel na waarde"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, 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:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Syntaxfout %s:%u: De richtlijn 'clear' vereist een optieboom als argument"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, 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"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Geen sleutelring geïnstalleerd in %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Commandoregel-optie '%c' [van %s] is onbekend."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Commandoregel-optie %s wordt niet begrepen"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Commandoregel-optie %s is niet booleaans"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Optie %s vereist een argument."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"Optie %s: De specificatie van het configuratie-item dient een =<waarde> te "
+"bevatten."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Optie %s vereist een integer getal als argument, niet '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Optie '%s' is te lang"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Waarde %s wordt niet begrepen, probeer 'true' of 'false'."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Ongeldige operatie %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n"
+"\n"
+"apt-extracttemplates is een programma om configuratie- en "
+"sjablooninformatie\n"
+"uit Debian pakketten te halen.\n"
+"\n"
+"Opties:\n"
+"  -h     Deze hulptekst.\n"
+"  -t      Stel de tijdelijke map in.\n"
+"  -c=? Lees dit configuratiebestand.\n"
+"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Kan de status van %s niet opvragen"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Pakket-extensielijst is te lang"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Fout bij het verwerken van map %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Bron-extensielijst is te lang"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Fout bij het verwerken van de inhoud van %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Gebruik: apt-ftparchive [opties] commando\n"
+"Opdrachten: packages <pad naar .deb's> [voorrangsbestand [padprefix]]\n"
+"            sources <pad naar .dsc's> [voorrangsbestand [padprefix]]\n"
+"            contents <pad>\n"
+"            release <pad>\n"
+"            generate config [groepen]\n"
+"            clean config\n"
+"\n"
+"Met apt-ftparchive genereert u index bestanden voor Debian archieven.\n"
+"Het ondersteunt verschillende generatiestijlen variërend van volledig \n"
+"automatisch tot een functionele vervanging van dpkg-scanpackages en \n"
+"dpkg-scansources\n"
+"\n"
+"apt-ftparchive genereert pakketbestanden van een boom met .debs.\n"
+"Het 'Packages'-bestand bevat de inhoud van alle 'control'-velden van elk\n"
+"pakket alsook de MD5 hash en de bestandsgrootte. Via een voorrangsbestand\n"
+"kunnen de waardes van de 'Priority'- en 'Section'-velden afgedwongen\n"
+"worden.\n"
+"\n"
+"Op overeenkomstige wijze genereert apt-ftparchive de 'Sources'-bestanden\n"
+"van een boom met .dscs. De '--source-override'-optie kan gebruikt worden\n"
+"om een voorrangsbestand voor bronpakketten te specificeren.\n"
+"\n"
+"De 'packages' en 'sources' opdrachten dienen uitgevoerd te worden \n"
+"in de basismap van de boom. Het pad naar de .deb's dient te verwijzen naar\n"
+"het startpunt van de recursieve zoekopdracht en een voorrangsbestand dient\n"
+"de voorrangsvlaggen te bevatten. Padprefix wordt toegevoegd aan het\n"
+"'filename'-veld indien dit aanwezig is. Enkele voorbeelden uit het debian\n"
+"archief:\n"
+"            apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"            dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opties:\n"
+"  -h          Deze hulptekst\n"
+"  --md5       Beheer de MD5 generatie\n"
+"  -s=?        Bronvoorrangsbestand\n"
+"  -q          Stille uitvoer\n"
+"  -d=?        Selecteert de optionele caching database\n"
+"  --no-delink Schakelt de ontlinking debug modus in\n"
+"  --contents  Beheer de generatie van het inhoudsbestand\n"
+"  -c=?        Lees dit configuratiebestand in\n"
+"  -o=?        Stel een willekeurige configuratie optie in"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Geen van de selecties kwam overeen"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB is beschadigd, bestand hernoemd naar %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie van "
+"apt, dient u de database te verwijderen en opnieuw aan te maken."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Kan het DB-bestand %s niet openen: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Archief heeft geen 'control'-record"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Kan geen cursor verkrijgen"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Kon map %s niet lezen\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Kon de status van %s niet opvragen\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "F: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "F: Er zijn fouten van toepassing op het bestand "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Oplossen van %s is mislukt"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Doorlopen boomstructuur is mislukt"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Openen van %s is mislukt"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " OntlLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "readlink op %s is mislukt"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Ontlinken van %s is mislukt"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Linken van %s aan %s is mislukt"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Ontlinklimiet van %sB bereikt.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Archief heeft geen 'package'-veld"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr " %s heeft geen voorrangsingang\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s beheerder is %s, niet %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Geheugentoewijzing is mislukt"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Kan %s niet openen"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Misvormde voorrangsingang %s op regel %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Lezen van het voorrangsbestand %s is mislukt"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Misvormde voorrangsingang %s op regel %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Misvormde voorrangsingang %s op regel %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Misvormde voorrangsingang %s op regel %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Onbekend compressie-algoritme '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Gecomprimeerde uitvoer %s vereist een compressieset"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Aanmaken van FILE* is mislukt"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Vorken van proces is mislukt"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Comprimeer kind"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Interne fout, aanmaken van %s is mislukt"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IO naar subproces/bestand is mislukt"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Lezen tijdens het berekenen van de MD5 is mislukt"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Probleem bij het ontlinken van %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n"
+"\n"
+"apt-extracttemplates is een programma om configuratie- en "
+"sjablooninformatie\n"
+"uit Debian pakketten te halen.\n"
+"\n"
+"Opties:\n"
+"  -h     Deze hulptekst.\n"
+"  -t      Stel de tijdelijke map in.\n"
+"  -c=? Lees dit configuratiebestand.\n"
+"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Onbekend pakketrecord!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Gebruik: apt-sortpkgs [opties] bestand1 [bestand2 ...]\n"
+"\n"
+"apt-sortpkgs is een simpel programma om pakketbestanden te sorteren.\n"
+"De -s optie wordt gebruikt om aan te geven om welk soort bestand het gaat.\n"
+"\n"
+"Opties:\n"
+"  -h    Deze helptekst\n"
+"  -s    Sorteer bronbestanden\n"
+"  -c=? Lees dit configuratiebestand\n"
+"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s is geen geldig DEB-pakket."
 
diff --git a/po/nn.po b/po/nn.po
index 29b8b6f60..063f1eedd 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -19,156 +19,157 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Tal p� pakkenamn: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Tal p� pakkenamn: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Vanlege pakkar: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Reine virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Samansette virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Manglar: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Tal p� einskildversjonar: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Tal p� einskildversjonar: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Tal p� krav: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Tal p� ver./fil-forhold: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Tal p� ver./fil-forhold: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Tal p� tilbyr-forhold: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Tal p� strengar med jokerteikn: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Storleik p� kravs- og versjonsrom: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Slingringsmon: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Brukt plass i alt: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ute av takt."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Fann ingen pakkar"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Du m� oppgi n�yaktig eitt mnster"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Finn ikkje pakken %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Spikra pakkar:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(ikkje funne)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Pakke spikra til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -241,19 +242,11 @@ msgstr ""
 "  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
 "Du finn meir informasjon p� manualsidene apt-cache(8) og apt.conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 #, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
@@ -261,12 +254,20 @@ msgstr ""
 " �%s�\n"
 "i stasjonen �%s� og trykk Enter.\n"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Klarte ikkje endra namnet p� %s til %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -302,66 +303,66 @@ msgstr ""
 "  -c=? Les denne oppsettsfila.\n"
 "  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Klarte ikkje f� status p� kjeldepakkelista %s"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil. AllUpgrade �ydelagde noko"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje l�sa nedlastingskatalogen"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
@@ -381,115 +382,115 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, 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:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 
-#: cmdline/apt-get.cc:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "M� henta %sB/%sB med kjeldekodearkiv.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "M� henta %sB med kjeldekodearkiv.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen �%s� mislukkast.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen �%s� mislukkast.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, 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:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -498,37 +499,37 @@ 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:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Koplar til %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "St�tta modular:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -614,53 +615,74 @@ msgstr ""
 "til apt-get(8), sources.list(5) og apt.conf(5).\n"
 "                       APT har superku-krefter.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Du m� velja minst �in pakke som kjeldekoden skal hentast for"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "men er ikkje installert"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "Den nyaste versjonen av %s er installert fr� f�r.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "Den nyaste versjonen av %s er installert fr� f�r.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Venta p� %s, men den fanst ikkje"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Klarte ikkje opna %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -687,7 +709,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -737,52 +759,52 @@ msgstr ""
 msgid "Disk not found."
 msgstr "Fann ikkje fila"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Fann ikkje fila"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Klarte ikkje f� status"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Klarte ikkje setja endringstidspunkt"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ugyldig URI. Lokale URI-ar kan ikkje starta med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Loggar inn"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Klarte ikkje avgjera namnet p� motparten"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Klarte ikkje avgjera det lokale namnet"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Tenaren nekta oss � kopla til, og sa: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -790,121 +812,123 @@ msgstr ""
 "Ein mellomtenar er oppgitt, men ikkje noko innloggingsskript. Feltet "
 "�Acquire::ftp::ProxyLogin� er tomt."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Kommandoen �%s� i innlogginsskriptet mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Tidsavbrot p� samband"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Tenaren lukka sambandet"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Lesefeil"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Eit svar flaumde over bufferen."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Protokoll�ydeleggjing"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Skrivefeil"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Klarte ikkje oppretta sokkel"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot p� sambandet"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Mislukkast"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Klarte ikkje kopla til passiv sokkel."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo klarte ikkje oppretta ein lyttesokkel"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Klarte ikkje binda til sokkel"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Klarte ikkje lytta til sokkel"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Klarte ikkje avgjera sokkelnamnet"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Klarte ikkje senda PORT-kommandoen"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukjend adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Tidsavbrot p� tilkopling til datasokkel"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av n�kkel for fil"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Klarte ikkje henta fila, tenaren sa �%s�"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Tidsavbrot p� datasokkelen"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverf�ringa mislukkast, tenaren sa �%s�"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Sp�rjing"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Klarte ikkje starta "
 
@@ -940,7 +964,7 @@ msgstr "Klarte ikkje kopla til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Koplar til %s"
@@ -970,184 +994,420 @@ 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:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Dei f�lgjande tilleggspakkane vil verta installerte:"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fr� tenaren. Sambandet vart lukka i andre enden"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Feil ved lesing fr� tenaren"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Tidsavbrot p� sambandet"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Ventar p� hovud"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "�ydelagd hovudlinje"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tenaren sende eit ugyldig �Content-Length�-hovud"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tenaren sende eit ugyldig �Content-Range�-hovud"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tenaren har �ydelagd st�tte for omr�de"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "�ydelagde hovuddata"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Reknar ut oppgradering ... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Intern feil. AllUpgrade �ydelagde noko"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Ferdig"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Rettar p� krav ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislukkast."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Klarte ikkje retta p� krav"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarte ikkje minimera oppgraderingsmengda"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Ferdig"
+
+#: apt-private/private-cachefile.cc:108
+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�."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nokre krav er ikkje oppfylte. Pr�v med �-f�."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "F�lgjande pakkar har krav som ikkje er oppfylte:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installert"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s skal installerast"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "men l�t seg ikkje installera"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "men er ein virtuell pakke"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "men er ikkje installert"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "men skal ikkje installerast"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Dei f�lgjande NYE pakkane vil verta installerte:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Dei f�lgjande pakkane vil verta FJERNA:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Dei f�lgjande pakkane er haldne tilbake:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Dei f�lgjande pakkane vil verta oppgraderte:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Dei f�lgjande pakkane vil verta NEDGRADERTE:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Dei f�lgjande pakkane som er haldne tilbake vil verta endra:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (fordi %s) "
+
+#: apt-private/private-output.cc:662
+#, fuzzy
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"�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!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu oppgraderte, %lu nyleg installerte, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu installerte p� nytt, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderte, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex-kompileringsfeil - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Oppdateringskommandoen tek ingen argument"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Nokre pakkar m� fjernast, men fjerning er sl�tt av."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil ved tilleggjing av avleiing"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "M� henta %sB/%sB med arkiv.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "M� henta %sB med arkiv.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har ikkje nok ledig plass i %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Det oppstod problem, og �-y� vart brukt utan �--force-yes�"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "�Trivial Only� var spesifisert, men dette er ikkje noka triviell handling."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Ja, gjer som eg seier!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1158,19 +1418,19 @@ msgstr ""
 "For � halda fram, m� du skriva n�yaktig �%s�.\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Avbryt."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Vil du halda fram?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Klarte ikkje henta nokre av filene"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1178,19 +1438,19 @@ msgstr ""
 "Klarte ikkje henta nokre av arkiva. Du kan pr�va med �apt-get update� eller "
 "�--fix-missing�."
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "�--fix-missing� og byte av medium er ikkje st�tta for tida"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Klarte ikkje retta opp manglande pakkar."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Avbryt installasjon."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1200,15 +1460,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1224,16 +1484,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "F�lgjande informasjon kan hjelpa med � l�ysa situasjonen:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil. AllUpgrade �ydelagde noko"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1243,7 +1503,7 @@ msgid_plural ""
 msgstr[0] "Dei f�lgjande NYE pakkane vil verta installerte:"
 msgstr[1] "Dei f�lgjande NYE pakkane vil verta installerte:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1251,18 +1511,18 @@ msgid_plural ""
 msgstr[0] "Dei f�lgjande NYE pakkane vil verta installerte:"
 msgstr[1] "Dei f�lgjande NYE pakkane vil verta installerte:"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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�."
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1270,7 +1530,7 @@ msgstr ""
 "Nokre krav er ikkje oppfylte. Du kan pr�va �apt-get -f install� (eller velja "
 "ei l�ysing)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1282,320 +1542,92 @@ msgstr ""
 "distribusjonen, kan det �g henda at nokre av pakkane som trengst ikkje\n"
 "er laga enno eller at dei framleis ligg i �Incoming�."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "�ydelagde pakkar"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Dei f�lgjande tilleggspakkane vil verta installerte:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "F�resl�tte pakkar:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Tilr�dde pakkar"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "�TVARING: Klarer ikkje autentisere desse pakkane."
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Nokre pakkar kunne ikkje bli autentisert"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Installer desse pakkane utan verifikasjon?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikkje henta %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "F�lgjande pakkar har krav som ikkje er oppfylte:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installert"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s skal installerast"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "men l�t seg ikkje installera"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "men er ein virtuell pakke"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "men er ikkje installert"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "men skal ikkje installerast"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Dei f�lgjande NYE pakkane vil verta installerte:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Dei f�lgjande pakkane vil verta FJERNA:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Dei f�lgjande pakkane er haldne tilbake:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Dei f�lgjande pakkane vil verta oppgraderte:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Dei f�lgjande pakkane vil verta NEDGRADERTE:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Dei f�lgjande pakkane som er haldne tilbake vil verta endra:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (fordi %s) "
-
-#: apt-private/private-output.cc:631
-#, fuzzy
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"�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!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu oppgraderte, %lu nyleg installerte, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu installerte p� nytt, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderte, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex-kompileringsfeil - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Rettar p� krav ..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " mislukkast."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Klarte ikkje retta p� krav"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarte ikkje minimera oppgraderingsmengda"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Ferdig"
-
-#: apt-private/private-cachefile.cc:102
-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�."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nokre krav er ikkje oppfylte. Pr�v med �-f�."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Oppdateringskommandoen tek ingen argument"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Reknar ut oppgradering ... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Intern feil. AllUpgrade �ydelagde noko"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Ferdig"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Klarte ikkje endra namnet p� %s til %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Treff "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Hent:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Feil "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Henta %sB p� %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Arbeider]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1608,19 +1640,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarte ikkje lesa %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Klarte ikkje byta til %s"
@@ -1649,11 +1681,11 @@ msgstr "Klarte ikkje opna fila %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Klarte ikkje oppretta IPC-r�yr til underprosessen"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Sambandet vart uventa stengd"
 
@@ -1693,1347 +1725,479 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p� nytt."
 msgid "Merging available information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates er eit verkt�y for � henta ut informasjon om\n"
-"oppsett og malar fr� Debian-pakkar.\n"
-"\n"
-"Val:\n"
-"  -h   Vis denne hjelpeteksten\n"
-"  -t   Vel mellombels katalog\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Klarte ikkje skriva til %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Finn ikkje debconf-versjonen. Er debconf installert?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Lista over pakkeutvidingar er for lang"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Feil ved lesing av katalogen %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Lista over kjeldeutvidingar er for lang"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Feil ved skriving av topptekst til innhaldsfila"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Feil ved lesing av %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-#, fuzzy
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Bruk: apt-ftparchive [val] kommando\n"
-"Kommandoar: packages bin�rstig [overstyringsfil [stigprefiks]]\n"
-"          sources kjeldesti [overstyringsfil [stiprefiks]]\n"
-"          contents sti\n"
-"          generate config [grupper]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive opprettar indeksfiler for Debian-arkiv. Mange ulike\n"
-"m�tar kan brukast, fr� heilautomatiske til funksjonelle erstattingar\n"
-"for dpkg-scanpackages og dpkg-scansources.\n"
-"\n"
-"apt-ftparchive opprettar Package-filer fr� eit tre med .debs-filer.\n"
-"Package-fila inneheld alle kontrollfelta fr� kvar pakke i tillegg til\n"
-"MD5-n�kkel og filstorleik. Du kan bruka ei overstyringsfil for � tvinga\n"
-"gjennom verdiar for prioritet og kategori.\n"
-"\n"
-"apt-ftparchive kan p� same m�ten oppretta Sources-filer fr� eit tre\n"
-"med .dscs-filer. Du kan bruka ei overstyringsfil med --source-override.\n"
-"\n"
-"Kommandoane �packages� og �sources� skal k�yrast i rota av katalogtreet.\n"
-"Bin�rstien skal peika til toppkatalogen i det rekursive s�ket, og\n"
-"overstyringsfila skal innehalda innstillingar for overstyring.\n"
-"Stiprefikset vert lagt til filnamnfelta dersom det er oppgjeve. Her er\n"
-"eit d�me p� bruk i Debian-arkivet:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Val:\n"
-"  -h    Vis denne hjelpeteksten.\n"
-"  --md5 Styrer MD5-genereringa.\n"
-"  -s=?  Overstyringsfil for kjeldekode.\n"
-"  -q    Stille.\n"
-"  -d=?  Vel ein anna mellomlagerdatabase.\n"
-"  --no-delink Bruk avlusingsmodus med delinking.\n"
-"  --contents  Styrer opprettinga av innhaldsfila.\n"
-"  -c=?  Les denne oppsettsfila.\n"
-"  -o=? Set ei vilk�rleg innstilling."
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Ingen utval passa"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Enkelte filer manglar i pakkefilgruppa %s"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Databasen er �ydelagd. Filnamnet er endra til %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB er for gammal, fors�kjer � oppgradere %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Klarte ikkje opna DB-fila %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Klarte ikkje f� status til %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Arkivet har ingen kontrollpost"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Klarte ikkje f� peikar"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "�: Klarte ikkje lesa katalogen %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "�: Klarte ikkje f� status til %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "F: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "�: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "F: Det er feil ved fila "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Klarte ikkje sl� opp %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Treklatring mislukkast"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Klarte ikkje opna %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Klarte ikkje lesa lenkja %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Klarte ikkje oppheva lenkja %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Klarte ikkje lenkja %s til %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-grensa p� %sB er n�dd.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Arkivet har ikkje noko pakkefelt"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har inga overstyringsoppf�ring\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
-
-#: ftparchive/writer.cc:712
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har inga overstyringsoppf�ring\n"
-
-#: ftparchive/writer.cc:716
-#, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s har inga overstyringsoppf�ring\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Klarte ikkje tildela minne"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Klarte ikkje opna %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Misforma overstyring %s linje %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Klarte ikkje lesa overstyringsfila %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Misforma overstyring %s linje %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Misforma overstyring %s linje %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Misforma overstyring %s linje %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Ukjend komprimeringsalgoritme %s"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimert utdata %s treng eit komprimeringssett"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Klarte ikkje oppretta FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Klarte ikkje gafla"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Komprimer barn"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Intern feil, klarte ikkje oppretta %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Klarte ikkje kommunisera med underprosess/fil"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Klarte ikkje lesa under utrekning av MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem ved oppheving av lenkje til %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Klarte ikkje endra namnet p� %s til %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates er eit verkt�y for � henta ut informasjon om\n"
-"oppsett og malar fr� Debian-pakkar.\n"
-"\n"
-"Val:\n"
-"  -h   Vis denne hjelpeteksten\n"
-"  -t   Vel mellombels katalog\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Ukjend pakkeoppslag"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Bruk: apt-sortpkgs [val] fil1 [fil2 ...]\n"
-"\n"
-"apt-sortpkgs er eit enkelt verkt�y for � sortera pakkefiler. Innstillinga\n"
-"-s vert brukt til � velja kva for ein type fil det er snakk om.\n"
-"\n"
-"Val:\n"
-"  -h   Vis denne hjelpeteksten.\n"
-"  -s   Bruk kjeldefilsortering.\n"
-"  -c=? Les denne oppsettsfila.\n"
-"  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Klarte ikkje oppretta r�yr"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Klarte ikkje k�yra gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "�ydelagt arkiv"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-sjekksummen mislukkast, arkivet er �ydelagt"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Ukjend TAR-hovud type %u, medlem %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Ugyldig arkivsignatur"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Feil ved lesing av arkivmedlemshovud"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ugyldig arkivmedlemshovud"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Ugyldig arkivmedlemshovud"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arkivet er for kort"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Klarte ikkje lesa arkivhovuda"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode vart kalla p� ein node som framleis er lenkja"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Fann ikkje n�kkelelementet."
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Klarte ikkje tildela avleiing"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Intern feil i AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Pr�ver � skriva over ei avleiing, %s -> %s og %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dobbel tilleggjing av avleiing %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Dobbel oppsettsfil %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "Klarte ikkje skriva fila %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Klarte ikkje lukka fila %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Stigen %s er for lang"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Pakkar ut %s meir enn �in gong"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Katalogen %s er avleidd"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Pakken pr�ver � skriva til avleiingsm�let %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Avleiingsstigen er for lang"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Klarte ikkje f� status til %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Klarte ikkje endra namnet p� %s til %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Fann ikkje noden i n�kkelb�tta"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Stigen er for lang"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Skriv over pakketreff utan versjon for %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Klarte ikkje f� status til %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "Klarte ikkje skriva fila %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Klarte ikkje lukka fila %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar �%s�-medlemmen"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Intern feil, fann ikkje medlemmen %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Kontrollfila kan ikkje tolkast"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Kan ikkje utf�ra mmap p� ei tom fil"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ugyldig arkivsignatur"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Klarte ikkje opna r�yr for %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Feil ved lesing av arkivmedlemshovud"
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Klarte ikkje laga mmap av %lu byte"
+msgid "Invalid archive member header %s"
+msgstr "Ugyldig arkivmedlemshovud"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Klarte ikkje opna %s"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ugyldig arkivmedlemshovud"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Klarte ikkje starta "
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arkivet er for kort"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Klarte ikkje laga mmap av %lu byte"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Klarte ikkje lesa arkivhovuda"
 
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Klarte ikkje skriva fila %s"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Klarte ikkje oppretta r�yr"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Klarte ikkje k�yra gzip "
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "�ydelagt arkiv"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar-sjekksummen mislukkast, arkivet er �ydelagt"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Ukjend TAR-hovud type %u, medlem %s"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "Klarte ikkje f� status p� %s."
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%limin %lis"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Selection %s not found"
-msgstr "Fann ikkje utvalet %s"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Ukjend typeforkorting: �%c�"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Opnar oppsettsfila %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, 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:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaksfeil %s:%u: Misforma tagg"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien"
-
-#: apt-pkg/contrib/configuration.cc:861
-#, 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"
+msgid "Packaging system '%s' is not supported"
+msgstr "Pakkesystemet �%s� er ikkje st�tta"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntaksfeil %s:%u: For mange n�sta inkluderte filer"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaksfeil %s:%u: Inkludert herifr�"
+msgid "Wrote %i records.\n"
+msgstr "Skreiv %i postar.\n"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, 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:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det �vste niv�et"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Skreiv %i postar med %i manglande filer.\n"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s ... Feil"
+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"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s ... Ferdig"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s ... Ferdig"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Kjenner ikkje kommandolinjevalet �%c� (fr� %s)."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Skj�nar ikkje kommandolinjevalet %s"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Kommandolinjevalet %s er ikkje boolsk"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Valet %s krev eit argument."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Val %s: Spesifikasjonen av oppsettselementet m� ha ein =<verdi>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Valet %s m� ha eit heiltalsargument, ikkje �%s�"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Valet �%s� er for langt"
+msgid "Hash mismatch for: %s"
+msgstr "Feil MD5-sum"
 
-#: apt-pkg/contrib/cmndline.cc:336
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Skj�nar ikkje %s. Pr�v �true� eller �false�."
+msgid "The method driver %s could not be found."
+msgstr "Finn ikkje metodedrivaren %s."
 
-#: apt-pkg/contrib/cmndline.cc:386
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Invalid operation %s"
-msgstr "Ugyldig operasjon %s"
+msgid "Is the package %s installed?"
+msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Klarte ikkje f� status til monteringspunktet %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Klarte ikkje f� status til CD-ROM"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s starta ikkje rett"
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/acquire-worker.cc:455
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problem ved l�sing av fila"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Brukar ikkje l�sing for den skrivebeskytta l�sefila %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Klarte ikkje opna l�sefila %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Brukar ikkje l�sing for den nfs-monterte l�sefila %s"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Klarte ikkje l�sa %s"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
+"Skifte av medum: Set inn plata merkt\n"
+" �%s�\n"
+"i stasjonen �%s� og trykk Enter.\n"
 
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila."
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:98
+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/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Underprosessen %s mottok ein segmenteringsfeil."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Underprosessen %s mottok ein segmenteringsfeil."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Underprosessen %s returnerte ein feilkode (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Underprosessen %s avslutta uventa"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Klarte ikkje opna fila %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Klarte ikkje opna r�yr for %s"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Klarte ikkje oppretta underprosessen IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Klarte ikkje k�yra komprimeringa "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "lese, har framleis %lu att � lesa, men ingen att"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "skrive, har framleis %lu att � skrive, men klarte ikkje"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Problem ved l�sing av fila"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problem ved synkronisering av fila"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problem ved oppheving av lenkje til fila"
-
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problem ved synkronisering av fila"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Avbryt installasjon."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Kjeldelista kan ikkje lesast."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Pakkelagerfila er �ydelagd"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Pakkelagerfila er �ydelagd"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT st�ttar ikkje versjonssystemet �%s�"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Pakkelageret er bygd for ein annan arkitektur"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Krav"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Forkrav"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Forslag"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Tilr�dingar"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Konflikt"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Byter ut"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Foreldar"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "p�kravd"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "vanleg"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Byggjer kravtre"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Kandidatversjonar"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Genererer kravforhold"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-#, fuzzy
-msgid "Reading state information"
-msgstr "Flettar informasjon om tilgjengelege pakkar"
-
-#: apt-pkg/depcache.cc:244
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikkje opna %s"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikkje skriva fila %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Klarte ikkje tolka pakkefila %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Misforma linje %lu i kjeldelista %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Opnar %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linja %u i kjeldelista %s er for lang."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Misforma linje %u i kjeldelista %s (type)"
-
-#: apt-pkg/sourcelist.cc:366
-#, fuzzy, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typen �%s� er ukjend i linja %u i kjeldelista %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typen �%s� er ukjend i linja %u i kjeldelista %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Klarte ikkje opna fila %s"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Denne installasjonen vil verta n�ydd til � mellombels fjerna den n�dvendige "
-"pakken %s p� grunn av ei konflikt/forkrav-l�kkje. Dette er ofte uheldig, men "
-"om du verkeleg vil gjera det, kan du bruka innstillinga �APT::Force-"
-"LoopBreak�."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indeksfiltypen �%s� er ikkje st�tta"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "Pakken %s m� installerast p� nytt, men arkivet finst ikkje."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Feil, �pkgProblemResolver::Resolve� har laga brot. Dette kan skuldast pakkar "
-"som er haldne tilbake."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Klarte ikkje retta opp problema. Nokre �ydelagde pakkar er haldne tilbake."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Listekatalogen %spartial manglar."
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arkivkatalogen %spartial manglar."
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Klarte ikkje l�sa listekatalogen"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
-
-#: apt-pkg/acquire.cc:895
-#, fuzzy, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Les filliste"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finn ikkje metodedrivaren %s."
-
-#: apt-pkg/acquire-worker.cc:115
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s starta ikkje rett"
-
-#: apt-pkg/acquire-worker.cc:452
-#, fuzzy, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Skifte av medum: Set inn plata merkt\n"
-" �%s�\n"
-"i stasjonen �%s� og trykk Enter.\n"
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Pakkesystemet �%s� er ikkje st�tta"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Klarte ikkje f� status p� %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Du m� leggja nokre kjelde-URI-ar i fila sources.list."
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Kjeldelista kan ikkje lesast."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Skj�nar ikkje spikringstypen %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Ingen prioritet (eller null) oppgitt for spiker"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Feil ved behandling av %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "J�ss, du har overg�tt talet p� pakkenamn som APT kan handtera."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "J�ss, du har overg�tt talet p� versjonar som APT kan handtera."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "J�ss, du har overg�tt talet p� versjonar som APT kan handtera."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "J�ss, du har overg�tt talet p� krav som APT kan handtera."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Fann ikkje pakken %s %s ved behandling av filkrav"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Klarte ikkje f� status p� kjeldepakkelista %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Les pakkelister"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Samlar inn filtilbod"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Klarte ikkje skriva til %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "IU-feil ved lagring av kjeldelager"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "endring av namn mislukkast, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Feil storleik"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3041,12 +2205,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3055,106 +2219,166 @@ msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du m� fiksa denne pakken sj�lv "
 "(fordi arkitekturen manglar)."
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Pakkeindeksfilene er �ydelagde. Feltet �Filename:� manglar for pakken %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
+msgid "List directory %spartial is missing."
+msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Merk, vel %s i staden for %s\n"
+msgid "Archives directory %spartial is missing."
+msgstr "Arkivkatalogen %spartial manglar."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Klarte ikkje l�sa listekatalogen"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:901
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldig linje i avleiingsfila: %s"
+msgid "Retrieving file %li of %li"
+msgstr "Les filliste"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
+"filer er brukte i staden."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Du m� leggja nokre kjelde-URI-ar i fila sources.list."
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk"
+msgid "Did not understand pin type %s"
+msgstr "Skj�nar ikkje spikringstypen %s"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Ingen prioritet (eller null) oppgitt for spiker"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Klarte ikkje opna fila %s"
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Denne installasjonen vil verta n�ydd til � mellombels fjerna den n�dvendige "
+"pakken %s p� grunn av ei konflikt/forkrav-l�kkje. Dette er ofte uheldig, men "
+"om du verkeleg vil gjera det, kan du bruka innstillinga �APT::Force-"
+"LoopBreak�."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Linja %u i kjeldelista %s er for lang."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Avmonterer CD-ROM ...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Brukar monteringspunktet %s for CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Avmonterer CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Ventar p� disk ...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Monterer CD-ROM ...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Identifiserer ... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Lagra etikett: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "Avmonterer CD-ROM ..."
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Leitar etter indeksfiler p� disken ...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "Lagra etikett: %s \n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Det er ikkje eit gyldig namn, pr�v igjen.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3163,302 +2387,1110 @@ msgstr ""
 "Disken vert kalla: \n"
 "�%s�\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Kopierer pakkelister ..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Skriv ny kjeldeliste\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Kjeldelisteoppf�ringar for denne disken er:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Skreiv %i postar.\n"
+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/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Skreiv %i postar med %i manglande filer.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Feil, �pkgProblemResolver::Resolve� har laga brot. Dette kan skuldast pakkar "
+"som er haldne tilbake."
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Klarte ikkje retta opp problema. Nokre �ydelagde pakkar er haldne tilbake."
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
-#, 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"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Byggjer kravtre"
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidatversjonar"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Genererer kravforhold"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Flettar informasjon om tilgjengelege pakkar"
+
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Feil MD5-sum"
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikkje opna %s"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikkje skriva fila %s"
+
+#: apt-pkg/tagfile.cc:140
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Klarte ikkje tolka pakkefila %s (2)"
+
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Fann ikkje utg�va �%s� av �%s�"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Fann ikkje versjonen �%s� av �%s�"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Fann ikkje pakken %s"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Fann ikkje pakken %s"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Fann ikkje pakken %s"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Merk, vel %s i staden for %s\n"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldig linje i avleiingsfila: %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
+
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Misforma linje %lu i kjeldelista %s (URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
-"filer er brukte i staden."
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Opnar %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Misforma linje %u i kjeldelista %s (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, fuzzy, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Typen �%s� er ukjend i linja %u i kjeldelista %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen �%s� er ukjend i linja %u i kjeldelista %s"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Koplar til %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Tilr�dingar"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Klarte ikkje skriva til %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Klarte ikkje l�sa listekatalogen"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Fann ikkje utvalet %s"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Brukar ikkje l�sing for den skrivebeskytta l�sefila %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Klarte ikkje opna l�sefila %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Brukar ikkje l�sing for den nfs-monterte l�sefila %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Klarte ikkje l�sa %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Underprosessen %s mottok ein segmenteringsfeil."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Underprosessen %s mottok ein segmenteringsfeil."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Underprosessen %s returnerte ein feilkode (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Underprosessen %s avslutta uventa"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problem ved l�sing av fila"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Klarte ikkje opna fila %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Klarte ikkje opna r�yr for %s"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Klarte ikkje oppretta underprosessen IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Klarte ikkje k�yra komprimeringa "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "lese, har framleis %lu att � lesa, men ingen att"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "skrive, har framleis %lu att � skrive, men klarte ikkje"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problem ved l�sing av fila"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem ved synkronisering av fila"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problem ved oppheving av lenkje til fila"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problem ved synkronisering av fila"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s ... Feil"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s ... Ferdig"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s ... Ferdig"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Kan ikkje utf�ra mmap p� ei tom fil"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Klarte ikkje opna r�yr for %s"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Klarte ikkje laga mmap av %lu byte"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Klarte ikkje opna %s"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Klarte ikkje starta "
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Klarte ikkje laga mmap av %lu byte"
+
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Klarte ikkje skriva fila %s"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Klarte ikkje f� status til monteringspunktet %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Klarte ikkje f� status til CD-ROM"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Ukjend typeforkorting: �%c�"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Opnar oppsettsfila %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaksfeil %s:%u: Misforma tagg"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaksfeil %s:%u: Inkludert herifr�"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, 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:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det �vste niv�et"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Avbryt installasjon."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Kjenner ikkje kommandolinjevalet �%c� (fr� %s)."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Skj�nar ikkje kommandolinjevalet %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Kommandolinjevalet %s er ikkje boolsk"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Valet %s krev eit argument."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Val %s: Spesifikasjonen av oppsettselementet m� ha ein =<verdi>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Valet %s m� ha eit heiltalsargument, ikkje �%s�"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Valet �%s� er for langt"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Skj�nar ikkje %s. Pr�v �true� eller �false�."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Ugyldig operasjon %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates er eit verkt�y for � henta ut informasjon om\n"
+"oppsett og malar fr� Debian-pakkar.\n"
+"\n"
+"Val:\n"
+"  -h   Vis denne hjelpeteksten\n"
+"  -t   Vel mellombels katalog\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Klarte ikkje f� status til %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Finn ikkje debconf-versjonen. Er debconf installert?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Lista over pakkeutvidingar er for lang"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Feil ved lesing av katalogen %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Lista over kjeldeutvidingar er for lang"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Feil ved skriving av topptekst til innhaldsfila"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Feil ved lesing av %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+#, fuzzy
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Bruk: apt-ftparchive [val] kommando\n"
+"Kommandoar: packages bin�rstig [overstyringsfil [stigprefiks]]\n"
+"          sources kjeldesti [overstyringsfil [stiprefiks]]\n"
+"          contents sti\n"
+"          generate config [grupper]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive opprettar indeksfiler for Debian-arkiv. Mange ulike\n"
+"m�tar kan brukast, fr� heilautomatiske til funksjonelle erstattingar\n"
+"for dpkg-scanpackages og dpkg-scansources.\n"
+"\n"
+"apt-ftparchive opprettar Package-filer fr� eit tre med .debs-filer.\n"
+"Package-fila inneheld alle kontrollfelta fr� kvar pakke i tillegg til\n"
+"MD5-n�kkel og filstorleik. Du kan bruka ei overstyringsfil for � tvinga\n"
+"gjennom verdiar for prioritet og kategori.\n"
+"\n"
+"apt-ftparchive kan p� same m�ten oppretta Sources-filer fr� eit tre\n"
+"med .dscs-filer. Du kan bruka ei overstyringsfil med --source-override.\n"
+"\n"
+"Kommandoane �packages� og �sources� skal k�yrast i rota av katalogtreet.\n"
+"Bin�rstien skal peika til toppkatalogen i det rekursive s�ket, og\n"
+"overstyringsfila skal innehalda innstillingar for overstyring.\n"
+"Stiprefikset vert lagt til filnamnfelta dersom det er oppgjeve. Her er\n"
+"eit d�me p� bruk i Debian-arkivet:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Val:\n"
+"  -h    Vis denne hjelpeteksten.\n"
+"  --md5 Styrer MD5-genereringa.\n"
+"  -s=?  Overstyringsfil for kjeldekode.\n"
+"  -q    Stille.\n"
+"  -d=?  Vel ein anna mellomlagerdatabase.\n"
+"  --no-delink Bruk avlusingsmodus med delinking.\n"
+"  --contents  Styrer opprettinga av innhaldsfila.\n"
+"  -c=?  Les denne oppsettsfila.\n"
+"  -o=? Set ei vilk�rleg innstilling."
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Ingen utval passa"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Enkelte filer manglar i pakkefilgruppa %s"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Databasen er �ydelagd. Filnamnet er endra til %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB er for gammal, fors�kjer � oppgradere %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Klarte ikkje opna DB-fila %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Arkivet har ingen kontrollpost"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Klarte ikkje f� peikar"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "�: Klarte ikkje lesa katalogen %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "�: Klarte ikkje f� status til %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "F: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "�: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "F: Det er feil ved fila "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Klarte ikkje sl� opp %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Treklatring mislukkast"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Klarte ikkje opna %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Klarte ikkje lesa lenkja %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Klarte ikkje oppheva lenkja %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Klarte ikkje lenkja %s til %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink-grensa p� %sB er n�dd.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Arkivet har ikkje noko pakkefelt"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s har inga overstyringsoppf�ring\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
+
+#: ftparchive/writer.cc:721
+#, fuzzy, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s har inga overstyringsoppf�ring\n"
+
+#: ftparchive/writer.cc:725
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s har inga overstyringsoppf�ring\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Klarte ikkje tildela minne"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Klarte ikkje opna %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Misforma overstyring %s linje %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Klarte ikkje lesa overstyringsfila %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Misforma overstyring %s linje %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Misforma overstyring %s linje %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Misforma overstyring %s linje %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Ukjend komprimeringsalgoritme %s"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimert utdata %s treng eit komprimeringssett"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Klarte ikkje oppretta FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Klarte ikkje gafla"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Komprimer barn"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Intern feil, klarte ikkje oppretta %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Klarte ikkje kommunisera med underprosess/fil"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Klarte ikkje lesa under utrekning av MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem ved oppheving av lenkje til %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates er eit verkt�y for � henta ut informasjon om\n"
+"oppsett og malar fr� Debian-pakkar.\n"
+"\n"
+"Val:\n"
+"  -h   Vis denne hjelpeteksten\n"
+"  -t   Vel mellombels katalog\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Ukjend pakkeoppslag"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Bruk: apt-sortpkgs [val] fil1 [fil2 ...]\n"
+"\n"
+"apt-sortpkgs er eit enkelt verkt�y for � sortera pakkefiler. Innstillinga\n"
+"-s vert brukt til � velja kva for ein type fil det er snakk om.\n"
+"\n"
+"Val:\n"
+"  -h   Vis denne hjelpeteksten.\n"
+"  -s   Bruk kjeldefilsortering.\n"
+"  -c=? Les denne oppsettsfila.\n"
+"  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s er ingen gyldig DEB-pakke."
 
diff --git a/po/pl.po b/po/pl.po
index b2c1e3658..f706012e8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2012-07-28 21:53+0200\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -23,154 +23,155 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Liczba nazw pakietów: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Liczba wszystkich typów pakietów: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Zwykłych pakietów: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Czysto wirtualnych pakietów: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Pojedynczych pakietów wirtualnych: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Mieszanych pakietów wirtualnych: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Brakujących: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "W sumie różnych wersji: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "W sumie różnych opisów: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "W sumie zależności: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "W sumie zależności wersja/plik: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "W sumie zależności opis/plik: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "W sumie mapowań zapewnień: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "W sumie dopasowanych napisów: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Sumaryczny rozmiar obszaru zależności od wersji: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Sumaryczny rozmiar niewykorzystanego miejsca: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Całkowity rozmiar: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Plik pakietu %s jest przestarzały."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Nie znaleziono żadnych pakietów"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Należy podać przynajmniej jeden wzorzec"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "To polecenie jest przestarzałe. Prosimy używać \"apt-mark showauto\"."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nie udało się odnaleźć pakietu %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Plików pakietów:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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."
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Przypięte pakiety:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(nie znaleziono)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Zainstalowana: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Kandydująca: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(brak)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Sposób przypięcia: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Tabela wersji:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -241,28 +242,28 @@ msgstr ""
 "Więcej informacji można znaleźć na stronach podręcznika apt-cache(8)\n"
 "oraz apt.conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Proszę wprowadzić nazwę dla tej płyty, np. \"Debian 5.0.3 Disk 1\""
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Proszę włożyć dysk do napędu i nacisnąć enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Nie udało się zamontować \"%s\" w \"%s\""
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Należy powtórzyć ten proces dla reszty płyt."
 
@@ -298,50 +299,50 @@ msgstr ""
 "  -c=? Czyta wskazany plik konfiguracyjny.\n"
 "  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 "Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 "Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 "Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Zmieniono wybrany pakiet źródłowy na \"%s\" z \"%s\"\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Ignorowanie niedostępnej wersji \"%s\" pakietu \"%s\""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nie udało się odnaleźć pakietu %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s zaznaczony jako zainstalowany automatycznie.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -349,21 +350,21 @@ msgstr ""
 "To polecenie jest przestarzałe. Prosimy używać \"apt-mark auto\" i \"apt-"
 "mark manual\"."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Nie udało się zablokować katalogu pobierania"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
@@ -390,80 +391,80 @@ msgstr ""
 "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego "
 "pakietu.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pomijanie już pobranego pliku \"%s\"\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, 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:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "W %s nie ma wystarczającej ilości wolnego miejsca"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Pobieranie źródeł %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Nie udało się pobrać niektórych archiwów."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Ukończono pobieranie w trybie samego pobierania"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Polecenie budowania \"%s\" zawiodło.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Proces potomny zawiódł"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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 dla budowania"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -472,17 +473,17 @@ msgstr ""
 "Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt."
 "conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nie ma zależności dla budowania.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -491,7 +492,7 @@ msgstr ""
 "Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone "
 "w pakietach \"%s\""
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -500,14 +501,14 @@ msgstr ""
 "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
 "pakietu %s"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -516,7 +517,7 @@ msgstr ""
 "Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja "
 "pakietu %s nie spełnia wymagań wersji"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -525,30 +526,30 @@ msgstr ""
 "Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma "
 "wersji kandydującej"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Nie udało się spełnić zależności dla budowania %s."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Nie udało się przetworzyć zależności dla budowania"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Dziennik zmian %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Obsługiwane moduły:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -636,55 +637,78 @@ msgstr ""
 "apt-get(8), sources.list(5) i apt.conf(5).\n"
 "                         Ten APT ma moce Super Krowy.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
+"źródła"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s nie może zostać oznaczony, ponieważ nie jest zainstalowany.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s został już ustawiony jako zainstalowany ręcznie.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s został już ustawiony jako zainstalowany automatycznie.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s został już zatrzymany.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s został już odznaczony jako zatrzymany.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Oczekiwano na proces %s, ale nie było go"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s został zatrzymany.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Odznaczono zatrzymanie %s\n"
 
 # Musi pasować do su i sudo.
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 "Uruchomienie dpkg nie powiodło się. Czy użyto uprawnień administratora?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -733,7 +757,7 @@ msgstr ""
 "Proszę zapoznać się ze stronami podręcznika systemowego apt-mark(8)\n"
 "i apt.conf(5), aby uzyskać więcej informacji."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -781,52 +805,52 @@ msgstr "Nie udało się odmontować CD-ROM-u w %s, być może wciąż jest używ
 msgid "Disk not found."
 msgstr "Nie odnaleziono dysku."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Nie odnaleziono pliku"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Nie udało się wykonać operacji stat"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Nie udało się ustawić czasu modyfikacji"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Nieprawidłowe URI, lokalne URI nie mogą zaczynać się od //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Logowanie się"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Nie można określić nazwy zdalnego systemu"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Nie udało się określić nazwy lokalnego systemu"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Serwer odrzucił połączenie, otrzymana odpowiedź: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Polecenie USER nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Polecenie PASS nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -834,123 +858,125 @@ msgstr ""
 "Określono serwer pośredniczący, ale nie określono skryptu rejestrowania, "
 "Acquire::ftp::ProxyLogin jest puste."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Polecenie skryptu rejestrowania \"%s\" nie powiodło się, odpowiedź serwera: "
 "%s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Polecenie TYPE nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Przekroczenie czasu połączenia"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Serwer zamknął połączenie"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Błąd odczytu"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Odpowiedź przepełniła bufor."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Naruszenie zasad protokołu"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Błąd zapisu"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Nie udało się utworzyć gniazda"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Nie udało się"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Nie udało się połączyć pasywnego gniazda."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nie było w stanie uzyskać nasłuchującego gniazda"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Nie udało się przyłączyć gniazda"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Nie udało się nasłuchiwać na gnieździe"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Nie udało się określić nazwy gniazda"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Nie można wysłać polecenia PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Nieznana rodzina adresów %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Polecenie EPRT nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Przekroczony czas połączenia gniazda danych"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Nie udało się przyjąć połączenia"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Nie udało się obliczyć skrótu pliku"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nie można pobrać pliku, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Przekroczony czas oczekiwania na dane"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Nie udało się przesłać danych, odpowiedź serwera: %s"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Info"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Nie można wywołać "
 
@@ -986,7 +1012,7 @@ msgstr "Nie udało się połączyć z %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Łączenie z %s"
@@ -1016,39 +1042,39 @@ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Nie udało się połączyć z %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Błąd wewnętrzny: Prawidłowy podpis, ale nie udało się ustalić odcisku klucza!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nie udało się uruchomić gpgv by zweryfikować podpis (czy gpgv jest "
 "zainstalowane?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Nieznany błąd podczas uruchamiania gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Następujące podpisy były błędne:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1056,149 +1082,385 @@ msgstr ""
 "Następujące podpisy nie mogły zostać zweryfikowane z powodu braku klucza "
 "publicznego:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Puste pliki nie mogą być prawidłowymi archiwami"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Błąd przy pisaniu do pliku"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Błąd czytania z serwera"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Błąd przy pisaniu do pliku"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Operacja select nie powiodła się"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Przekroczenie czasu połączenia"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Błąd przy pisaniu do pliku wyjściowego"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Oczekiwanie na nagłówki"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Nieprawidłowa linia nagłówka"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek odpowiedzi"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Length"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Range"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Nieznany format daty"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Błędne dane nagłówka"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Połączenie nie powiodło się"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Obliczanie aktualizacji..."
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Gotowe"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Naprawianie zależności..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " nie udało się."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nie udało się naprawić zależności"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nie udało się zminimalizować zbioru aktualizacji"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Gotowe"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Niespełnione zależności. Proszę spróbować użyć -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Następujące pakiety mają niespełnione zależności:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "ale %s jest zainstalowany"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale %s ma zostać zainstalowany"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "ale nie da się go zainstalować"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "ale jest pakietem wirtualnym"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "ale nie jest zainstalowany"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "ale nie zostanie zainstalowany"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " lub"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Następujące pakiety zostaną USUNIĘTE:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Następujące pakiety zostały zatrzymane:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Następujące pakiety zostaną zaktualizowane:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (z powodu %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"UWAGA: Zostaną usunięte następujące istotne pakiety.\n"
+"NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ponownie instalowanych, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu cofniętych wersji, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[T/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[t/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "T"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Błąd kompilacji wyrażenia regularnego - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Polecenie update nie wymaga żadnych argumentów"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Błąd wewnętrzny, sortowanie niezakończone"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Wystąpił dziwny błąd - rozmiary się nie zgadzają. Proszę to zgłosić pod "
 "apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Konieczne pobranie %sB/%sB archiwów.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Konieczne pobranie %sB archiwów.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Wystąpiły problemy, a użyto -y bez --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Nakazano wykonywać tylko trywialne operacje, a ta do nich nie należy."
 
 # Bezpieczniej jest nie używać tu polskich znaków.
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Tak, jestem pewien!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1209,19 +1471,19 @@ msgstr ""
 "Aby kontynuować proszę napisać zdanie \"%s\"\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Przerwane."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Kontynuować?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Nie udało się pobrać niektórych plików"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1229,19 +1491,19 @@ msgstr ""
 "Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get "
 "update lub użyć opcji --fix-missing."
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Nie udało się poprawić brakujących pakietów."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Przerywanie instalacji"
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1258,15 +1520,15 @@ msgstr[2] ""
 "Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki "
 "zostały nadpisane przez inne pakiety:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Uwaga: dpkg wykonał to automatycznie i celowo."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1284,15 +1546,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Błąd wewnętrzny spowodowany przez AutoRemover"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1308,7 +1570,7 @@ msgstr[2] ""
 "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej "
 "wymagane:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1323,19 +1585,19 @@ msgstr[2] ""
 "%lu pakietów zostało zainstalowanych automatycznie i nie są już więcej "
 "wymagane.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Aby go usunąć należy użyć \"apt-get autoremove\"."
 msgstr[1] "Aby je usunąć należy użyć \"apt-get autoremove\"."
 msgstr[2] "Aby je usunąć należy użyć \"apt-get autoremove\"."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Należy uruchomić \"apt-get -f install\", aby naprawić poniższe problemy:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1343,7 +1605,7 @@ msgstr ""
 "Niespełnione zależności. Proszę spróbować wykonać \"apt-get -f install\" bez "
 "pakietów (lub podać rozwiązanie)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1355,326 +1617,99 @@ msgstr ""
 "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n"
 "z katalogu Incoming (\"Przychodzące\")."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Pakiety są uszkodzone"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Sugerowane pakiety:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Polecane pakiety:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"UWAGA: To jest tylko symulacja!\n"
+"      apt-get wymaga do normalnego działania uprawnień administratora.\n"
+"      Aktualnie blokowanie jest wyłączone, więc nie należy polegać\n"
+"      na związku z rzeczywistą sytuacją!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Niektóre pakiety nie mogły zostać zweryfikowane"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Zainstalować te pakiety bez weryfikacji?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nie udało się pobrać %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Następujące pakiety mają niespełnione zależności:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "ale %s jest zainstalowany"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ale %s ma zostać zainstalowany"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "ale nie da się go zainstalować"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "ale jest pakietem wirtualnym"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "ale nie jest zainstalowany"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "ale nie zostanie zainstalowany"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " lub"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Następujące pakiety zostaną USUNIĘTE:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Następujące pakiety zostały zatrzymane:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Następujące pakiety zostaną zaktualizowane:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (z powodu %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"UWAGA: Zostaną usunięte następujące istotne pakiety.\n"
-"NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ponownie instalowanych, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu cofniętych wersji, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[T/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[t/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "T"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Błąd kompilacji wyrażenia regularnego - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Naprawianie zależności..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " nie udało się."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Nie udało się naprawić zależności"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Nie udało się zminimalizować zbioru aktualizacji"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Gotowe"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Niespełnione zależności. Proszę spróbować użyć -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Polecenie update nie wymaga żadnych argumentów"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Obliczanie aktualizacji..."
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Gotowe"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"UWAGA: To jest tylko symulacja!\n"
-"      apt-get wymaga do normalnego działania uprawnień administratora.\n"
-"      Aktualnie blokowanie jest wyłączone, więc nie należy polegać\n"
-"      na związku z rzeczywistą sytuacją!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Nie udało się zmienić nazwy %s na %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
 # Ujednolicono z aptitude
-#: apt-private/acqprogress.cc:63
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Stary "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Pobieranie:"
 
 # Wyrównane do Hit i Err.
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign.  "
 
 # Wyrównane do Hit i Ign.
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Błąd  "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Pobrano %sB w %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Pracuje]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1687,19 +1722,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nie można czytać %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nie udało się przejść do %s"
@@ -1728,11 +1763,11 @@ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\""
 msgid "[Mirror: %s]"
 msgstr "[Serwer lustrzany: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Nie udało się utworzyć potoku IPC do podprocesu"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Połączenie zostało przedwcześnie zamknięte"
 
@@ -1775,1335 +1810,447 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Łączenie informacji o dostępnych pakietach"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Użycie: apt-extracttemplates plik1 [plik2 ...]\n"
-"\n"
-"apt-extracttemplates to narzędzie służące do pobierania informacji\n"
-"i konfiguracji i szablonach z pakietów Debiana.\n"
-"\n"
-"Opcje:\n"
-"  -h   Ten tekst pomocy.\n"
-"  -t   Ustawia katalog tymczasowy\n"
-"  -c=? Czyta wskazany plik konfiguracyjny.\n"
-"  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nie udało się pisać do %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Lista rozszerzeń pakietów jest zbyt długa"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Błąd przetwarzania katalogu %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Lista rozszerzeń źródeł jest zbyt długa"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Błąd podczas przetwarzania zawartości %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Użycie: apt-ftparchive [opcje] polecenie\n"
-"Polecenia: packages ścieżka_do_binariów [plik_override [przedrostek]]\n"
-"           sources ścieżka_do_źródeł [plik_override [przedrostek]]\n"
-"           contents ścieżka\n"
-"           release ścieżka\n"
-"           generate konfiguracja [grupy]\n"
-"           clean konfiguracja\n"
-"\n"
-"apt-ftparchive generuje pliki indeksów dla archiwów Debiana. Obsługuje\n"
-"różne rodzaje generowania, od w pełni zautomatyzowanych po funkcjonalne\n"
-"zamienniki programów dpkg-scanpackages i dpkg-scansources.\n"
-"\n"
-"apt-ftparchive generuje pliki Package na postawie drzewa plików .deb.\n"
-"Wygenerowany plik zawiera pola kontrolne wszystkich pakietów oraz ich\n"
-"skróty MD5 i rozmiary. Obsługiwany jest plik override, pozwalający wymusić\n"
-"priorytet i dział pakietu.\n"
-"\n"
-"apt-ftparchive podobnie generuje pliki Sources na podstawie drzewa plików\n"
-".dsc. Przy pomocy opcji --source-override można podać plik override dla\n"
-"źródeł.\n"
-"\n"
-"Polecenia \"packages\" i \"sources\" powinny być wykonywane w katalogu "
-"głównym\n"
-"drzewa. \"ścieżka_do_binariów\" powinna wskazywać na katalog, od którego "
-"zacznie\n"
-"się wyszukiwanie, a plik override powinien zawierać odpowiednie flagi.\n"
-"Przedrostek (o ile został podany) jest dodawany przed ścieżką do każdego\n"
-"pliku. Przykładowe użycie, z archiwum Debiana:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opcje:\n"
-"  -h    Ten tekst pomocy\n"
-"  --md5 Generuje sumy kontrolne MD5\n"
-"  -s=?  Plik override dla źródeł\n"
-"  -q    \"Ciche\" działanie\n"
-"  -d=?  Opcjonalna podręczna baza danych\n"
-"  --no-delink Włącza tryb diagnostyczny odłączania\n"
-"  --contents  Generuje plik zawartości (Contents)\n"
-"  -c=?  Czyta wskazany plik konfiguracyjny\n"
-"  -o=?  Ustawia dowolną opcję konfiguracji"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Nie dopasowano żadnej nazwy"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Brakuje pewnych plików w grupie plików pakietów \"%s\""
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Baza była uszkodzona, plik został przeniesiony do %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Baza jest przestarzała, próbuję zaktualizować %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Niepoprawny format bazy. Jeśli zaktualizowano ze starszej wersji apt, proszę "
-"usunąć i utworzyć ponownie bazę danych."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nie udało się otworzyć pliku bazy %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Nie udało się wykonać operacji stat na %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Archiwum nie posiada rekordu kontrolnego"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Nie udało się pobrać kursora"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Nie udało się odczytać katalogu %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Nie można wykonać operacji stat na %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Błędy odnoszą się do pliku "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Nie udało się przetłumaczyć nazwy %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Przejście po drzewie nie powiodło się"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Nie udało się otworzyć %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Odłączenie %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Nie udało się odczytać dowiązania %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Nie udało się usunąć %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Nie udało się dowiązać %s do %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Archiwum nie posiadało pola pakietu"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nie posiada wpisu w pliku override\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  opiekunem %s jest %s, a nie %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nie posiada wpisu w pliku override źródeł\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nie posiada również wpisu w pliku override binariów\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nie udało się zaalokować pamięci"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Nie można otworzyć %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Nieprawidłowa linia %llu #1 pliku override %s"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nie udało się czytać pliku override %s"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Nieprawidłowa linia %llu #1 pliku override %s"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Nieprawidłowa linia %llu #2 pliku override %s"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Nieprawidłowa linia %llu #3 pliku override %s"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Nieznany algorytm kompresji \"%s\""
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Nie udało się utworzyć obiektu FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Nie udało się utworzyć procesu potomnego"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Potomny proces kompresujący"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Błąd wewnętrzny, nie udało się utworzyć %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Zawiodła operacja IO na pliku/podprocesie"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem przy usuwaniu %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Nie udało się zmienić nazwy %s na %s"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Użycie: apt-internal-solver\n"
-"\n"
-"apt-internal-solver jest interfejsem do używania bieżącego, wewnętrznego\n"
-"mechanizmu rozwiązywania zależności - w sposób podobny jak zewnętrznego\n"
-"mechanizmu rodziny APT - do celów debugowania itp.\n"
-"\n"
-"Opcje:\n"
-"  -h   Ten tekst pomocy.\n"
-"  -q   Zapisywalne wyjście - brak wskaźnika postępu\n"
-"  -c=? Czyta wskazany plik konfiguracyjny\n"
-"  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Nieznane informacje o pakiecie!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Użycie: apt-sortpkgs [opcje] plik1 [plik2 ...]\n"
-"\n"
-"apt-sortpkgs to proste narzędzie służące do sortowania plików pakietów.\n"
-"Opcji -s używa się do wskazania typu pliku.\n"
-"\n"
-"Opcje:\n"
-"  -h   Ten tekst pomocy.\n"
-"  -s   Sortowanie pliku źródeł.\n"
-"  -c=? Czyta wskazany plik konfiguracyjny.\n"
-"  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Nie udało się utworzyć potoków"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Nie udało się uruchomić programu gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Uszkodzone archiwum"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Nieznany typ nagłówka TAR %u, składnik %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Nieprawidłowy podpis archiwum"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Błąd przy czytaniu nagłówka składnika archiwum"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Nieprawidłowy nagłówek składnika archiwum: %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Nieprawidłowy nagłówek składnika archiwum"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Archiwum jest za krótkie"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Nie udało się odczytać nagłówków archiwum"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode wywołane na wciąż podłączonym węźle"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Nie udało się odnaleźć elementu tablicy haszującej!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Nie udało się utworzyć ominięcia"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Błąd wewnętrzny w AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Próba nadpisania ominięcia, %s -> %s i %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Podwójne dodanie ominięcia %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Zduplikowany plik konfiguracyjny %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Nie udało się zapisać pliku %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Nie udało się zamknąć pliku %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Ścieżka %s jest zbyt długa"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Wypakowanie %s więcej niż raz"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Ominięcie katalogu %s"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Pakiet próbuje pisać do celu ominięcia %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Zbyt długa ścieżka ominięcia"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Nie udało się wykonać operacji stat na %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nie udało się zmienić nazwy %s na %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Katalog %s został zastąpiony obiektem nie będącym katalogiem"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Nie udało się znaleźć węzła w jego kubełku haszującym"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Ścieżka jest zbyt długa"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Nadpisujący pakiet nie pasuje z wersją %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nie można wykonać operacji stat na %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Nie udało się zapisać pliku %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Nie udało się zamknąć pliku %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\""
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Nie można wykonać mmap na pustym pliku"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Nie udało się zduplikować deskryptora pliku %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Nie udało się wykonać mmap %llu bajtów"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Nie udało się zamknąć mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Nie udało się zsynchronizować mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Nie udało się wykonać mmap %lu bajtów"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Nie udało się uciąć zawartości pliku %s"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-"
-"Start. Bieżąca wartość: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Nie udało się zwiększyć rozmiaru MMap, ponieważ limit %lu bajtów został już "
-"osiągnięty."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Nie udało się zwiększyć rozmiaru MMap, ponieważ automatycznie powiększanie "
-"zostało wyłączone przez użytkownika."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lidni %lig %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lig %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Nie odnaleziono wyboru %s"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Nierozpoznany skrót typu: \"%c\""
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Otwieranie pliku konfiguracyjnego %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, 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:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Błąd składniowy %s:%u: Błędny znacznik"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, 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:861
-#, 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:868
-#, 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:872 apt-pkg/contrib/configuration.cc:877
-#, 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:881
-#, 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:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Błąd składniowy %s:%u: czysta dyrektywa wymaga drzewa opcji jako argumentu"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, 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"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Błąd!"
-
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Gotowe"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Gotowe"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Opcja linii poleceń \"%c\" [z %s] jest nieznana."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Niezrozumiała opcja linii poleceń %s"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Opcja linii poleceń %s nie jest typu logicznego"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Opcja %s wymaga argumentu."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opcja %s: Specyfikacja elementu konfiguracji musi zawierać =<wartość>."
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Nieprawidłowy podpis archiwum"
 
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Opcja %s wymaga argumentu typu całkowitego, nie \"%s\""
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Błąd przy czytaniu nagłówka składnika archiwum"
 
-#: apt-pkg/contrib/cmndline.cc:304
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "Opcja \"%s\" jest zbyt długa"
+msgid "Invalid archive member header %s"
+msgstr "Nieprawidłowy nagłówek składnika archiwum: %s"
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Znaczenie %s jest nieznane, proszę spróbować true lub false."
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Nieprawidłowy nagłówek składnika archiwum"
 
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Nieprawidłowa operacja %s"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Archiwum jest za krótkie"
 
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Nie udało się wykonać operacji stat na punkcie montowania %s"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Nie udało się odczytać nagłówków archiwum"
 
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Nie udało się wykonać operacji stat na CDROM-ie"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Nie udało się utworzyć potoków"
 
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problem przy zamykaniu pliku gzip %s"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Nie udało się uruchomić programu gzip "
 
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Uszkodzone archiwum"
 
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Nie udało się otworzyć pliku blokady %s"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Nieznany typ nagłówka TAR %u, składnik %s"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Could not get lock %s"
-msgstr "Nie udało się uzyskać blokady %s"
+msgid "Unable to stat %s."
+msgstr "Nie udało się wykonać operacji stat na pliku %s."
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Lista plików nie może zostać stworzona, ponieważ \"%s\" nie jest katalogiem"
 
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Ignorowanie \"%s\" w katalogu \"%s\", ponieważ nie jest to zwykły plik"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Uruchamianie dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-"Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ nie ma on rozszerzenia "
-"pliku"
+msgid "Packaging system '%s' is not supported"
+msgstr "System pakietów \"%s\" nie jest obsługiwany"
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
-"Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ ma on nieprawidłowe "
-"rozszerzenie pliku"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Nie udało się określić odpowiedniego typu systemu pakietów"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Podproces %s spowodował naruszenie ochrony pamięci."
+msgid "Wrote %i records.\n"
+msgstr "Zapisano %i rekordów.\n"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Podproces %s otrzymał sygnał %u."
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n"
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Podproces %s zwrócił kod błędu (%u)"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Podproces %s zakończył się niespodziewanie"
+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"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open file %s"
-msgstr "Nie udało się otworzyć pliku %s"
+msgid "Can't find authentication record for: %s"
+msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Nie udało się otworzyć deskryptora pliku %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Nie udało się utworzyć IPC z podprocesem"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Nie udało się uruchomić kompresora "
+msgid "Hash mismatch for: %s"
+msgstr "Błędna suma kontrolna dla: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało"
+msgid "The method driver %s could not be found."
+msgstr "Nie udało się odnaleźć sterownika metody %s."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "należało zapisać jeszcze %llu, ale nie udało się to"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "Problem przy zamykaniu pliku %s"
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nie uruchomiła się poprawnie"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problem przy zapisywaniu pliku %s w %s"
+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/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problem przy odlinkowywaniu pliku %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Nie udało się otworzyć lub zanalizować zawartości list pakietów."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problem przy zapisywaniu pliku na dysk"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Należy uruchomić apt-get update aby naprawić te problemy."
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Brak zainstalowanej bazy kluczy w %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Nie udało się odczytać list źródeł."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Pusty magazyn podręczny pakietów"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Magazyn podręczny pakietów jest uszkodzony"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Magazyn podręczny pakietów jest w niezgodnej wersji"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Magazyn podręczny pakietów jest uszkodzony - jest zbyt mały"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 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:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Wymaga"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Wymaga wstępnie"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Sugeruje"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Poleca"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "W konflikcie z"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Zastępuje"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Dezaktualizuje"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Narusza zależności"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Rozszerza"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "ważny"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "wymagany"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "standardowy"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "opcjonalny"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "dodatkowy"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Budowanie drzewa zależności"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Kandydujące wersje"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Generowanie zależności"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Odczyt informacji o stanie"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie udało się otworzyć pliku stanu %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Otwieranie %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linia %u w liście źródeł %s jest zbyt długa."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Nie udało się wykonać natychmiastowej konfiguracji %s. Proszę wykonać \"man "
-"5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć "
-"się więcej. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nie udało się skonfigurować \"%s\". "
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"To uruchomienie programu będzie wymagało tymczasowego usunięcia istotnego "
-"pakietu %s z powodu pętli konfliktów/wymagań wstępnych. Często jest to złe "
-"rozwiązanie, ale jeśli jest się pewnym swoich działań, należy włączyć opcję "
-"APT::Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego "
-"archiwum."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane "
-"zatrzymanymi pakietami."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Brakuje katalogu list %spartial."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Brakuje katalogu archiwów %spartial."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nie udało się zablokować katalogu %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Pobieranie pliku %li z %li (pozostało %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Pobieranie pliku %li z %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nie udało się odnaleźć sterownika metody %s."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nie uruchomiła się poprawnie"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "System pakietów \"%s\" nie jest obsługiwany"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Nie udało się określić odpowiedniego typu systemu pakietów"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nie udało się wykonać operacji stat na pliku %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Należy dopisać jakieś URI pakietów źródłowych do pliku sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Nie udało się otworzyć lub zanalizować zawartości list pakietów."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Nie udało się odczytać list źródeł."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"Wartość %s jest nieprawidłowa dla APT::Default-Release, ponieważ takie "
-"wydanie nie jest dostępne w źródłach"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Nierozpoznany typ przypinania %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Brak (lub zerowy) priorytet przypięcia"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Magazyn podręczny ma niezgodny system wersji"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Pakiet %s %s nie został odnaleziony podczas przetwarzania zależności plików"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Czytanie list pakietów"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Zbieranie zapewnień plików"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nie udało się pisać do %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Wysyłanie scenariusza do mechanizmu rozwiązywania zależności"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Przygotowywanie na otrzymanie rozwiązania"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania "
+"prawidłowego komunikatu o błędzie"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Błędna suma kontrolna"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Błędny rozmiar"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Nieprawidłowa operacja %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3112,16 +2259,16 @@ msgstr ""
 "Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release "
 "(nieprawidłowy wpis sources.list lub nieprawidłowy plik)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3130,12 +2277,12 @@ msgstr ""
 "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
 "repozytorium nie będą wykonywane."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3145,12 +2292,12 @@ msgstr ""
 "w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Błąd GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3159,83 +2306,148 @@ msgstr ""
 "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
 "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nie udało się przeanalizować pliku Release %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Blok producenta %s nie zawiera odcisku"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Brak sekcji w pliku Release %s"
+msgid "List directory %spartial is missing."
+msgstr "Brakuje katalogu list %spartial."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Brak wpisu Hash w pliku Release %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Brakuje katalogu archiwów %spartial."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Nieprawidłowy wpis Valid-Until w pliku Release %s"
+msgid "Unable to lock directory %s"
+msgstr "Nie udało się zablokować katalogu %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Nieprawidłowy wpis Date w pliku Release %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Pobieranie pliku %li z %li (pozostało %s)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Blok producenta %s nie zawiera odcisku"
+msgid "Retrieving file %li of %li"
+msgstr "Pobieranie pliku %li z %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub "
+"użyto ich starszej wersji."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Należy dopisać jakieś URI pakietów źródłowych do pliku sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"Wartość %s jest nieprawidłowa dla APT::Default-Release, ponieważ takie "
+"wydanie nie jest dostępne w źródłach"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Nierozpoznany typ przypinania %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Brak (lub zerowy) priorytet przypięcia"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Nie udało się wykonać natychmiastowej konfiguracji %s. Proszę wykonać \"man "
+"5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć "
+"się więcej. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nie udało się skonfigurować \"%s\". "
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"To uruchomienie programu będzie wymagało tymczasowego usunięcia istotnego "
+"pakietu %s z powodu pętli konfliktów/wymagań wstępnych. Często jest to złe "
+"rozwiązanie, ale jeśli jest się pewnym swoich działań, należy włączyć opcję "
+"APT::Force-LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Linia %u w liście źródeł %s jest zbyt długa."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Odmontowanie CD-ROM-u...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Użycie %s jako punktu montowania CD-ROM-u\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Odmontowanie CD-ROM-u\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Oczekiwanie na płytę...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Montowanie CD-ROM-u...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "Identyfikacja.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "Identyfikacja... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etykieta: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Odmontowanie CD-ROM-u...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "Skanowanie płyty w poszukiwaniu plików indeksu..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "Skanowanie płyty w poszukiwaniu plików indeksu...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3244,7 +2456,7 @@ 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:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3252,16 +2464,16 @@ msgstr ""
 "Nie można odnaleźć żadnych plików pakietów, być może nie jest to dysk "
 "Debiana lub jest to inna architektura?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Znaleziono etykietę \"%s\"\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "To nie jest prawidłowa nazwa, proszę spróbować ponownie.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3270,83 +2482,109 @@ msgstr ""
 "Płyta nosi nazwę: \n"
 "\"%s\"\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Kopiowanie list pakietów..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Zapisywanie nowej listy źródeł\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Źródła dla tej płyty to:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Zapisano %i rekordów.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego "
+"archiwum."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane "
+"zatrzymanymi pakietami."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Budowanie drzewa zależności"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandydujące wersje"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generowanie zależności"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Odczyt informacji o stanie"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n"
+msgid "Failed to open StateFile %s"
+msgstr "Nie udało się otworzyć pliku stanu %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, 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"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Błędna suma kontrolna dla: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nie udało się odnaleźć zadania \"%s\""
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 "Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr ""
 "Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Nie udało się wybrać wersji z pakietu \"%s\", ponieważ jest on czysto "
 "wirtualny"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3355,178 +2593,241 @@ msgstr ""
 "Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", "
 "ponieważ nie ma żadnej z nich"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Nie udało się wybrać najnowszej wersji pakietu \"%s\", ponieważ jest on "
 "czysto wirtualny"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Nie udało się wybrać wersji kandydującej pakietu %s, ponieważ nie ma "
 "kandydata"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Nie udało się wybrać zainstalowanej wersji z pakietu %s, ponieważ nie jest "
 "zainstalowany"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Wysyłanie scenariusza do mechanizmu rozwiązywania zależności"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nie udało się przeanalizować pliku Release %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Brak sekcji w pliku Release %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Przygotowywanie na otrzymanie rozwiązania"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Brak wpisu Hash w pliku Release %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania "
-"prawidłowego komunikatu o błędzie"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Nieprawidłowy wpis Valid-Until w pliku Release %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nieprawidłowy wpis Date w pliku Release %s"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Uruchamianie dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub "
-"użyto ich starszej wersji."
+"Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Otwieranie %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Instalowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigurowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Usuwanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Całkowite usuwanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Proszę odnotować zniknięcie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Uruchamianie wyzwalacza post-installation %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Brakuje katalogu \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nie udało się otworzyć pliku \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Przygotowywanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozpakowywanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Przygotowywanie do konfiguracji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Pakiet %s został zainstalowany"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Przygotowywanie do usunięcia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Pakiet %s został usunięty"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Przygotowywanie do całkowitego usunięcia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Pakiet %s został całkowicie usunięty"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Nie udało się pisać do %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "Operacja została przerwana, zanim mogła zostać zakończona"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3534,7 +2835,7 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że "
 "przyczyna niepowodzenia leży w poprzednim błędzie."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3542,7 +2843,7 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
 "przepełnienie dysku"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3550,7 +2851,7 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
 "braku wolnej pamięci"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3559,14 +2860,14 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
 "przepełnienie dysku"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
 "wejścia/wyjścia dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3576,7 +2877,7 @@ msgstr ""
 "używa?"
 
 # Musi pasować do su i sudo.
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3585,17 +2886,752 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg został przerwany, należy wykonać ręcznie \"%s\", aby naprawić problem."
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Niezablokowany"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lidni %lig %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lig %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Nie odnaleziono wyboru %s"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Nie udało się otworzyć pliku blokady %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Nie udało się uzyskać blokady %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+"Lista plików nie może zostać stworzona, ponieważ \"%s\" nie jest katalogiem"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "Ignorowanie \"%s\" w katalogu \"%s\", ponieważ nie jest to zwykły plik"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+"Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ nie ma on rozszerzenia "
+"pliku"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ ma on nieprawidłowe "
+"rozszerzenie pliku"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Podproces %s spowodował naruszenie ochrony pamięci."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Podproces %s otrzymał sygnał %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Podproces %s zakończył się niespodziewanie"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problem przy zamykaniu pliku gzip %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Nie udało się otworzyć pliku %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nie udało się otworzyć deskryptora pliku %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Nie udało się utworzyć IPC z podprocesem"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Nie udało się uruchomić kompresora "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "należało zapisać jeszcze %llu, ale nie udało się to"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problem przy zamykaniu pliku %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem przy zapisywaniu pliku %s w %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problem przy odlinkowywaniu pliku %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problem przy zapisywaniu pliku na dysk"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Błąd!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Gotowe"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Gotowe"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Nie można wykonać mmap na pustym pliku"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Nie udało się zduplikować deskryptora pliku %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Nie udało się wykonać mmap %llu bajtów"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Nie udało się zamknąć mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Nie udało się zsynchronizować mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nie udało się wykonać mmap %lu bajtów"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Nie udało się uciąć zawartości pliku %s"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-"
+"Start. Bieżąca wartość: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Nie udało się zwiększyć rozmiaru MMap, ponieważ limit %lu bajtów został już "
+"osiągnięty."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Nie udało się zwiększyć rozmiaru MMap, ponieważ automatycznie powiększanie "
+"zostało wyłączone przez użytkownika."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+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:246
+msgid "Failed to stat the cdrom"
+msgstr "Nie udało się wykonać operacji stat na CDROM-ie"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Nierozpoznany skrót typu: \"%c\""
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Otwieranie pliku konfiguracyjnego %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Błąd składniowy %s:%u: Błędny znacznik"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, 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:897
+#, 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:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Błąd składniowy %s:%u: czysta dyrektywa wymaga drzewa opcji jako argumentu"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, 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"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Brak zainstalowanej bazy kluczy w %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Opcja linii poleceń \"%c\" [z %s] jest nieznana."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Niezrozumiała opcja linii poleceń %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Opcja linii poleceń %s nie jest typu logicznego"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Opcja %s wymaga argumentu."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opcja %s: Specyfikacja elementu konfiguracji musi zawierać =<wartość>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Opcja %s wymaga argumentu typu całkowitego, nie \"%s\""
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opcja \"%s\" jest zbyt długa"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Znaczenie %s jest nieznane, proszę spróbować true lub false."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Nieprawidłowa operacja %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Użycie: apt-extracttemplates plik1 [plik2 ...]\n"
+"\n"
+"apt-extracttemplates to narzędzie służące do pobierania informacji\n"
+"i konfiguracji i szablonach z pakietów Debiana.\n"
+"\n"
+"Opcje:\n"
+"  -h   Ten tekst pomocy.\n"
+"  -t   Ustawia katalog tymczasowy\n"
+"  -c=? Czyta wskazany plik konfiguracyjny.\n"
+"  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nie można wykonać operacji stat na %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Lista rozszerzeń pakietów jest zbyt długa"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Błąd przetwarzania katalogu %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Lista rozszerzeń źródeł jest zbyt długa"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Błąd podczas przetwarzania zawartości %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Użycie: apt-ftparchive [opcje] polecenie\n"
+"Polecenia: packages ścieżka_do_binariów [plik_override [przedrostek]]\n"
+"           sources ścieżka_do_źródeł [plik_override [przedrostek]]\n"
+"           contents ścieżka\n"
+"           release ścieżka\n"
+"           generate konfiguracja [grupy]\n"
+"           clean konfiguracja\n"
+"\n"
+"apt-ftparchive generuje pliki indeksów dla archiwów Debiana. Obsługuje\n"
+"różne rodzaje generowania, od w pełni zautomatyzowanych po funkcjonalne\n"
+"zamienniki programów dpkg-scanpackages i dpkg-scansources.\n"
+"\n"
+"apt-ftparchive generuje pliki Package na postawie drzewa plików .deb.\n"
+"Wygenerowany plik zawiera pola kontrolne wszystkich pakietów oraz ich\n"
+"skróty MD5 i rozmiary. Obsługiwany jest plik override, pozwalający wymusić\n"
+"priorytet i dział pakietu.\n"
+"\n"
+"apt-ftparchive podobnie generuje pliki Sources na podstawie drzewa plików\n"
+".dsc. Przy pomocy opcji --source-override można podać plik override dla\n"
+"źródeł.\n"
+"\n"
+"Polecenia \"packages\" i \"sources\" powinny być wykonywane w katalogu "
+"głównym\n"
+"drzewa. \"ścieżka_do_binariów\" powinna wskazywać na katalog, od którego "
+"zacznie\n"
+"się wyszukiwanie, a plik override powinien zawierać odpowiednie flagi.\n"
+"Przedrostek (o ile został podany) jest dodawany przed ścieżką do każdego\n"
+"pliku. Przykładowe użycie, z archiwum Debiana:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opcje:\n"
+"  -h    Ten tekst pomocy\n"
+"  --md5 Generuje sumy kontrolne MD5\n"
+"  -s=?  Plik override dla źródeł\n"
+"  -q    \"Ciche\" działanie\n"
+"  -d=?  Opcjonalna podręczna baza danych\n"
+"  --no-delink Włącza tryb diagnostyczny odłączania\n"
+"  --contents  Generuje plik zawartości (Contents)\n"
+"  -c=?  Czyta wskazany plik konfiguracyjny\n"
+"  -o=?  Ustawia dowolną opcję konfiguracji"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Nie dopasowano żadnej nazwy"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Brakuje pewnych plików w grupie plików pakietów \"%s\""
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Baza była uszkodzona, plik został przeniesiony do %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Baza jest przestarzała, próbuję zaktualizować %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Niepoprawny format bazy. Jeśli zaktualizowano ze starszej wersji apt, proszę "
+"usunąć i utworzyć ponownie bazę danych."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nie udało się otworzyć pliku bazy %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Archiwum nie posiada rekordu kontrolnego"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Nie udało się pobrać kursora"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Nie udało się odczytać katalogu %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Nie można wykonać operacji stat na %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Błędy odnoszą się do pliku "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Nie udało się przetłumaczyć nazwy %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Przejście po drzewie nie powiodło się"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Nie udało się otworzyć %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " Odłączenie %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Nie udało się odczytać dowiązania %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Nie udało się usunąć %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Nie udało się dowiązać %s do %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Archiwum nie posiadało pola pakietu"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s nie posiada wpisu w pliku override\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  opiekunem %s jest %s, a nie %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s nie posiada wpisu w pliku override źródeł\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s nie posiada również wpisu w pliku override binariów\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Nie udało się zaalokować pamięci"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nie można otworzyć %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Nieprawidłowa linia %llu #1 pliku override %s"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nie udało się czytać pliku override %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Nieprawidłowa linia %llu #1 pliku override %s"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Nieprawidłowa linia %llu #2 pliku override %s"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Nieprawidłowa linia %llu #3 pliku override %s"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Nieznany algorytm kompresji \"%s\""
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Nie udało się utworzyć obiektu FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Nie udało się utworzyć procesu potomnego"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Potomny proces kompresujący"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Błąd wewnętrzny, nie udało się utworzyć %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Zawiodła operacja IO na pliku/podprocesie"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem przy usuwaniu %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Użycie: apt-internal-solver\n"
+"\n"
+"apt-internal-solver jest interfejsem do używania bieżącego, wewnętrznego\n"
+"mechanizmu rozwiązywania zależności - w sposób podobny jak zewnętrznego\n"
+"mechanizmu rodziny APT - do celów debugowania itp.\n"
+"\n"
+"Opcje:\n"
+"  -h   Ten tekst pomocy.\n"
+"  -q   Zapisywalne wyjście - brak wskaźnika postępu\n"
+"  -c=? Czyta wskazany plik konfiguracyjny\n"
+"  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Nieznane informacje o pakiecie!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Użycie: apt-sortpkgs [opcje] plik1 [plik2 ...]\n"
+"\n"
+"apt-sortpkgs to proste narzędzie służące do sortowania plików pakietów.\n"
+"Opcji -s używa się do wskazania typu pliku.\n"
+"\n"
+"Opcje:\n"
+"  -h   Ten tekst pomocy.\n"
+"  -s   Sortowanie pliku źródeł.\n"
+"  -c=? Czyta wskazany plik konfiguracyjny.\n"
+"  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s nie jest prawidłowym pakietem DEB."
 
diff --git a/po/pt.po b/po/pt.po
index 2007af808..51fdc2be7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2012-06-29 15:45+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -18,155 +18,156 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Total de nomes de pacotes: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Total de estruturas de pacotes: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Pacotes normais: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Pacotes virtuais puros: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Pacotes virtuais únicos: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Pacotes virtuais misturados: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Faltam: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Total de versões distintas: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Total de descrições distintas: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Total de dependências: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Total de relações ver/ficheiro: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Total de relações Desc/Ficheiro: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Total de Mapeamentos 'Provides': "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Total de strings globbed: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Espaço total de dependência de versão: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Espaço total desperdiçado: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Espaço total contabilizado: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro do pacote %s está dessincronizado."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Não foi encontrado nenhum pacote"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Tem de fornecer pelo menos um padrão de busca"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark "
 "showauto'."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Não foi possível encontrar o pacote %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Ficheiros de Pacotes :"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Pacotes Marcados:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(não encontrado)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Marcação do Pacote: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Tabela de Versão:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -237,29 +238,29 @@ msgstr ""
 "tmp\n"
 "Para mais informações veja as páginas do manual apt-cache(8) e apt.conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Por favor indique um nome para este Disco, tal como 'Debian 5.0.3 Disco 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Por favor insira um Disco no leitor e pressione enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Falhou ao montar '%s' para '%s'"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repita este processo para o resto dos CDs no seu conjunto."
 
@@ -296,47 +297,47 @@ msgstr ""
 "  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "A escolher '%s' como pacote pacote de código fonte em vez de '%s'\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Ignorar a versão '%s', não disponível, do pacote '%s'"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível encontrar o pacote %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s está definido para ser instalado manualmente.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s está definido para ser instalado automaticamente.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -344,19 +345,19 @@ msgstr ""
 "Este comando foi depreceado. Em vez disso, por favor utilize 'apt-mark auto' "
 "e 'apt-mark manual'."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro Interno, o solucionador de problemas estragou coisas"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Impossível criar acesso exclusivo ao directório de downloads"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, 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"
@@ -382,81 +383,81 @@ msgstr ""
 "bzr branch %s\n"
 "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, 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:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, 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:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, 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:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter código fonte %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Falhou obter alguns arquivos."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Download completo e em modo de fazer apenas o download"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "O comando de descompactação '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "O comando de compilação '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "O processo filho falhou"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -465,18 +466,18 @@ msgstr ""
 "Nenhuma informação de arquitectura disponível para %s. Para configuração "
 "veja apt.conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de compilação.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,7 +486,7 @@ msgstr ""
 "a dependência de %s por %s não pode ser satisfeita porque %s não é permitido "
 "em pacotes '%s'"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -494,14 +495,14 @@ 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:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -510,7 +511,7 @@ msgstr ""
 "a dependência de %s para %s não pode ser satisfeita porque a versão "
 "candidata do pacote %s não pode satisfazer os requisitos de versão"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -519,30 +520,30 @@ msgstr ""
 "a dependência de %s para %s não pode ser satisfeita porque o pacote %s não "
 "tem versão candidata"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, 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:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Falhou processar as dependências de compilação"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changlog para %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -632,53 +633,74 @@ msgstr ""
 "apt-get(8), sources.list(5) e apt.conf(5)\n"
 "                         Este APT tem Poderes de Super Vaca.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s não pode ser marcado pois não está instalado.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s já estava definido para ser instalado manualmente.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s já estava definido para ser instalado automaticamente.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s já estava marcado para manter.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s já estava para não manter.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperou por %s mas não estava lá"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s marcado para manter.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Cancelou manter em %s.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Falhou executar dpkg. É root?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -726,7 +748,7 @@ msgstr ""
 "tmp\n"
 "Para mais informações veja as páginas apt-mark(8) e apt.conf(5) do manual."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -774,52 +796,52 @@ msgstr "Impossível desmontar o CD-ROM em %s, pode ainda estar a ser utilizado."
 msgid "Disk not found."
 msgstr "Disco não encontrado."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Ficheiro não encontrado"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Falhou o stat"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Falhou definir hora de modificação"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI inválido, URIs locais não devem começar por //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "A identificar-se no sistema"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Não foi possível determinar o nome do posto"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Não foi possível determinar o nome local"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "O servidor recusou a ligação e respondeu: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -827,121 +849,123 @@ msgstr ""
 "Foi especificado um servidor de proxy mas não um script de login, Acquire::"
 "ftp::ProxyLogin está vazio."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "O comando de script de login '%s' falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Foi atingido o tempo limite de ligação"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "O servidor fechou a ligação"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Uma resposta sobrecarregou o buffer."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Corrupção de protocolo"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Erro de escrita"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Não foi possível criar um socket"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Não foi possível ligar socket de dados, a ligação expirou"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Falhou"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Não foi possível ligar socket passivo."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo não foi capaz de obter um socket de escuta"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Não foi possível fazer o bind a um socket"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Não foi possível executar listen no socket"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Não foi possível determinar o nome do socket"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Não foi possível enviar o comando PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Família de endereços %u desconhecida (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Ligação de socket de dados expirou"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar ligação"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Não foi possível obter o ficheiro, o servidor respondeu '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Expirou o tempo do socket de dados"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "A transferência de dados falhou, o servidor respondeu '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Pesquisa"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Não foi possível invocar "
 
@@ -977,7 +1001,7 @@ msgstr "Não foi possível ligar em %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "A ligar a %s"
@@ -1007,40 +1031,40 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Não foi possível ligar a %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Pelo menos uma assinatura inválida foi encontrada."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Não foi possível executar 'gpgv' para verificar a assinatura  (o gpgv está "
 "instalado?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido ao executar gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram inválidas:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1048,116 +1072,350 @@ msgstr ""
 "As seguintes assinaturas não puderam ser verificadas porque a chave pública "
 "não está disponível:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Ficheiros vazios não podem ser arquivos válidos"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Erro ao escrever para o ficheiro"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 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:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Erro ao escrever para ficheiro"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "A selecção falhou"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "O tempo da ligação expirou"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Erro ao escrever para o ficheiro de saída"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "A aguardar por cabeçalhos"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Linha de cabeçalho errada"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP possui suporte de range errado"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Dados de cabeçalho errados"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "A ligação falhou"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "A calcular a actualização... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Erro Interno, AllUpgrade estragou algo"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Pronto"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "A corrigir dependências..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falhou."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Não foi possível corrigir dependências"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Não foi possível minimizar o conjunto de actualizações"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Feito"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependências não satisfeitas. Tente utilizar -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "mas %s está instalado"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mas %s está para ser instalado"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "mas não é instalável"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "mas é um pacote virtual"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "mas não está instalado"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "mas não vai ser instalado"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Serão instalados os seguintes NOVOS pacotes:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Serão REMOVIDOS os seguintes pacotes:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Serão actualizados os seguintes pacotes:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Os seguintes pacotes mantidos serão mudados:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (devido a %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISO: Os seguintes pacotes essenciais serão removidos.\n"
+"Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu a que foi feito o downgrade, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu a remover e %lu não actualizados.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erro de compilação de regex - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "O comando update não leva argumentos"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro Interno, Ordering não terminou"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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"
+"Estranho... Os tamanhos não coincidiram, escreva para apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "É necessário obter %sB/%sB de arquivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "É necessário obter %sB de arquivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1165,31 +1423,31 @@ msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Você não possui espaço livre suficiente em %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Há problemas e foi utilizado -y sem --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only especificado mas isto não é uma operação trivial."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Sim, faça como eu digo!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1200,19 +1458,19 @@ msgstr ""
 "Para continuar escreva a frase '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Abortado."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Deseja continuar?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Falhou o download de alguns ficheiros"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1220,19 +1478,19 @@ msgstr ""
 "Não foi possível obter alguns arquivos, tente talvez correr apt-get update "
 "ou tente com --fix-missing?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing e troca de mídia não são suportados actualmente"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Não foi possível corrigir os pacotes em falta."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "A abortar a instalação."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1246,15 +1504,15 @@ msgstr[1] ""
 "Os seguintes pacotes desapareceram do seu sistema pois\n"
 "todos os ficheiros foram  por outros pacotes:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 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"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1272,15 +1530,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte informação pode ajudar a resolver a situação:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover estragou coisas"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1292,7 +1550,7 @@ msgstr[1] ""
 "Os seguintes pacotes foram instalados automaticamente e já não são "
 "necessários:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1301,17 +1559,17 @@ msgstr[0] "O pacote %lu foi instalado automaticamente e já não é necessário.
 msgstr[1] ""
 "Os pacotes %lu foram instalados automaticamente e já não são necessários.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Utilize 'apt-get autoremove' para o remover."
 msgstr[1] "Utilize 'apt-get autoremove' para os remover."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1319,7 +1577,7 @@ msgstr ""
 "Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1331,322 +1589,96 @@ msgstr ""
 "distribuição unstable em que alguns pacotes pedidos ainda não foram \n"
 "criados ou foram movidos do Incoming."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Pacotes estragados"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Os seguintes pacotes extra serão instalados:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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:\tIsto é apenas uma simulação!\n"
+"\to apt-get necessita de privilégios de root para a execução real.\n"
+"\tTenha em mente que o acesso exclusivo está desabilitado,\n"
+"\tpor isso não confie na relevância da real situação actual!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticação ultrapassado.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Alguns pacotes não puderam ser autenticados"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Instalar estes pacotes sem verificação?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou obter %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "mas %s está instalado"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mas %s está para ser instalado"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "mas não é instalável"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "mas é um pacote virtual"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "mas não está instalado"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "mas não vai ser instalado"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Serão instalados os seguintes NOVOS pacotes:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Serão REMOVIDOS os seguintes pacotes:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Serão actualizados os seguintes pacotes:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Os seguintes pacotes mantidos serão mudados:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (devido a %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISO: Os seguintes pacotes essenciais serão removidos.\n"
-"Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu a que foi feito o downgrade, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu a remover e %lu não actualizados.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erro de compilação de regex - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "A corrigir dependências..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Não foi possível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Não foi possível minimizar o conjunto de actualizações"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:102
-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."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependências não satisfeitas. Tente utilizar -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "O comando update não leva argumentos"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "A calcular a actualização... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Erro Interno, AllUpgrade estragou algo"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Pronto"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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:\tIsto é apenas uma simulação!\n"
-"\to apt-get necessita de privilégios de root para a execução real.\n"
-"\tTenha em mente que o acesso exclusivo está desabilitado,\n"
-"\tpor isso não confie na relevância da real situação actual!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Falha ao baixar %s  %s\n"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Hit "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Obter:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Obtidos %sB em %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [A trabalhar]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1659,19 +1691,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Não foi possível ler %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Impossível mudar para %s"
@@ -1700,11 +1732,11 @@ msgstr "Não pode ler ficheiro de mirror '%s'"
 msgid "[Mirror: %s]"
 msgstr "[Mirror: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Falha ao criar pipe IPC para subprocesso"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Ligação encerrada prematuramente"
 
@@ -1748,1349 +1780,456 @@ msgstr ""
 msgid "Merging available information"
 msgstr "A juntar a informação disponível"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Utilização: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n"
-"\n"
-"O apt-extracttemplates é uma ferramenta para extrair configuração\n"
-"e informação de template de pacotes debian.\n"
-"\n"
-"Opções:\n"
-"  -h   Este texto de ajuda\n"
-"  -t   Definir o directório temporário\n"
-"  -c=? Ler este ficheiro de configuração\n"
-"  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Não conseguiu escrever para %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Não pode obter a versão do debconf. O debconf está instalado?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "A lista de extensão de pacotes é demasiado longa"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Erro ao processar o directório %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Lista de extensão de códigos-fonte é demasiado longa"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Erro ao processar o conteúdo %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Utilização: apt-ftparchive [opções] comando\n"
-"Comandos: packages caminho_binário [ficheiro_override [prefixo_caminho]]\n"
-"          sources caminho_fonte [ficheiro_override [prefixo_caminho]]\n"
-"          contents caminho\n"
-"          release caminho\n"
-"          generate config [grupos]\n"
-"          clean config\n"
-"\n"
-"O apt-ftparchive gera ficheiros de índice para repositórios Debian. Ele \n"
-"suporta muitos estilos de criação, desde totalmente automatizados até \n"
-"substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n"
-"\n"
-"O apt-ftparchive gera ficheiros Packages a partir de uma árvore de .debs.\n"
-" O ficheiro Package contém o conteúdo de todos os campos de controle de \n"
-"cada pacote bem como o hash MD5 e tamanho do ficheiro. É suportado um \n"
-"ficheiro override para forçar o valor de Priority e Section.\n"
-"\n"
-"Similarmente, o apt-ftparchive gera ficheiros Sources a partir de uma \n"
-"árvore de .dscs. A opção --source-override pode ser utilizada para \n"
-"especificar um ficheiro override de fontes\n"
-"\n"
-"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n"
-"árvore. CaminhoBinário deve apontar para a base de procura recursiva \n"
-"e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n"
-"incluído aos campos filename caso esteja presente. Exemplo de uso do \n"
-"repositório Debian :\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opções:\n"
-"   -h    Este texto de ajuda\n"
-"   --md5 Controlar a criação do MD5\n"
-"   -s=?  Ficheiro override de código-fonte \n"
-"   -q    Silencioso\n"
-"   -d=?  Seleccionar a base de dados de caching opcional\n"
-"   --no-delink Habilitar o modo de debug delinking\n"
-"   --contents  Controlar a criação do ficheiro de conteúdo\n"
-"   -c=?  Ler este ficheiro de configuração\n"
-"   -o=?  Definir uma opção de configuração arbitrária"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Nenhuma selecção coincidiu"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "A base de dados é antiga, a tentar actualizar %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"O formato da BD é inválido. Se actualizou a partir de uma versão antiga do "
-"apt, por favor remova-a e crie novamente a base de dados."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Falha stat %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "O arquivo não tem registo de controlo"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Não foi possível obter um cursor"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Não foi possível ler o directório %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Não foi possível fazer stat %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Os erros aplicam-se ao ficheiro "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Falhou resolver %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Falhou ao percorrer a árvore"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Falhou abrir %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Falhou o readlink %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Falhou o unlink %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Falhou ligar %s a %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Limite DeLink de %sB atingido.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Arquivo não possuía campo package"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s não possui entrada override\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " o maintainer de %s é %s, não %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s não possui fonte de entrada de 'override'\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s também não possui entrada binária de 'override'\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Falhou alocar memória"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Não foi possível abrir %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Override %s malformado linha %llu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Falhou ler o ficheiro override %s"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Override %s malformado linha %llu #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Override %s malformado linha %llu #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Override %s malformado linha %llu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo de compressão desconhecido '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Saída compactada %s precisa de um conjunto de compressão"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Falhou criar FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Falhou o fork"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Compactar filho"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Erro Interno, falhou criar %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Falhou o IO para subprocesso/arquivo"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Falhou ler durante o cálculo de MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema ao executar unlinking %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Falhou renomear %s para %s"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Utilização: apt-internal-solver\n"
-"\n"
-"O apt-internal-solver é um interface para utilizar o actual interno como um\n"
-" resolvedor externo para a família APT para depuração ou semelhante.\n"
-"\n"
-"Opções:\n"
-"  -h  Este texto de ajuda.\n"
-"  -q  Saída para registo - sem indicador de progresso\n"
-"  -c=? Ler este ficheiro de configuração\n"
-"  -o=? Definir uma opção de configuração arbitrária, p.e. dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Registo de pacote desconhecido!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Utilização: apt-sortpkgs [opções] ficheiro1 [ficheiro2 ...]\n"
-"\n"
-"O apt-sortpkgs é uma ferramenta simples para ordenar ficheiros de pacotes.\n"
-"A opção -s é utilizada para indicar que tipo de ficheiro é.\n"
-"\n"
-"Opções:\n"
-"  -h   Este texto de ajuda\n"
-"  -s   Utilizar a ordenação de ficheiros de código-fonte\n"
-"  -c=? Ler este ficheiro de configuração\n"
-"  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
-"tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Falhou a criação de pipes"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Falhou executar gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Arquivo corrompido"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "A soma de controlo do tar falhou, arquivo corrompido"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Assinatura de arquivo inválida"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Erro na leitura de cabeçalho membro de arquivo"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Cabeçalho membro de arquivo inválido %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Cabeçalho membro de arquivo inválido"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arquivo é demasiado pequeno"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Falha ao ler os cabeçalhos do arquivo"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode chamado em nó ainda linkado"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Falha ao localizar o elemento de hash!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Falha ao alocar desvio (diversion)"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Erro Interno em AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "A tentar sobrescrever um desvio, %s -> %s e %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Adição dupla de desvio %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Arquivo de configuração duplicado %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Falhou escrever o ficheiro %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Falhou fechar o ficheiro %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "O caminho %s é demasiado longo"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "A descompactar %s mais de uma vez"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "O directório %s é desviado"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "O pacote está a tentar escrever no alvo de desvio %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "O caminho de desvio é muito longo"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Falha stat %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Falhou renomear %s para %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "O directório %s está a ser substituído por um não-directório"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Falhou localizar o nó no seu hash bucket"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "O caminho é demasiado longo"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Substituir o pacote correspondente sem versão para %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Não foi possível fazer stat %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Falhou escrever o ficheiro %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Falhou fechar o ficheiro %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Este não é um arquivo DEB válido, falta o membro '%s'"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Erro Interno, não foi possível localizar o membro %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Ficheiro de controle não interpretável"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Não é possível fazer mmap a um ficheiro vazio"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Não foi possível duplicar o descritor de ficheiro %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Não foi possível fazer mmap de %llu bytes"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Não foi possível fechar mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Não foi sincronizar mmap "
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Não foi possível fazer mmap de %lu bytes"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Falhou truncar o ficheiro"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::Cache-"
-"Start. Valor actual: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Não foi possível aumentar o tamanho do MMap pois o limite de %lu bytes já "
-"foi alcançado."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Não foi possível aumentar o tamanho do MMap pois o crescimento automático "
-"está desabilitado pelo utilizador."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Assinatura de arquivo inválida"
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Erro na leitura de cabeçalho membro de arquivo"
 
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Selection %s not found"
-msgstr "A selecção %s não foi encontrada"
+msgid "Invalid archive member header %s"
+msgstr "Cabeçalho membro de arquivo inválido %s"
 
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Abreviatura de tipo desconhecida: '%c'"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Cabeçalho membro de arquivo inválido"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "A abrir o ficheiro de configuração %s"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arquivo é demasiado pequeno"
 
-#: apt-pkg/contrib/configuration.cc:785
-#, 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-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Falha ao ler os cabeçalhos do arquivo"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Erro de sintaxe %s:%u: Tag mal formada"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Falhou a criação de pipes"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Falhou executar gzip "
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Arquivo corrompido"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Erro de sintaxe %s:%u: Demasiados includes encadeados"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "A soma de controlo do tar falhou, arquivo corrompido"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada"
+msgid "Unable to stat %s."
+msgstr "Não foi possível fazer stat %s."
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Erro de sintaxe %s:%u: directiva clara necessita de uma árvore de opções "
-"como argumento"
 
-#: apt-pkg/contrib/configuration.cc:934
-#, 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"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Erro !"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "A correr o dpkg"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Pronto"
+msgid "Packaging system '%s' is not supported"
+msgstr "Sistema de empacotamento '%s' não é suportado"
 
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
+"Não foi possível determinar um tipo de sistema de empacotamento adequado"
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Pronto"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Opção '%c' da linha de comandos [de %s] é desconhecida."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Opção %s de linha de comandos não é compreendida"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Opção %s da linha de comandos não é booleana"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "A opção %s necessita de um argumento."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opção %s: Especificação de item de configuração tem de ter um =<val>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Opção %s necessita de um número inteiro como argumento, não '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Opção '%s' é demasiado longa"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "O sentido %s não é compreendido, tente verdadeiro ou falso."
-
-#: apt-pkg/contrib/cmndline.cc:386
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Invalid operation %s"
-msgstr "Operação %s inválida"
+msgid "Wrote %i records.\n"
+msgstr "Escreveu %i registos.\n"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Impossível executar stat ao ponto de montagem %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Impossível executar stat ao cdrom"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problema ao fechar o ficheiro gzip %s"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n"
 
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Not using locking for read only lock file %s"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s"
+"Escreveu %i registos com %i ficheiros em falta e %i ficheiros não "
+"coincidentes\n"
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open lock file %s"
-msgstr "Não foi possível abrir ficheiro de lock %s"
+msgid "Can't find authentication record for: %s"
+msgstr "Não foi possível encontrar registo de autenticação para: %s"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via "
-"nfs"
+msgid "Hash mismatch for: %s"
+msgstr "Hash não coincide para: %s"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not get lock %s"
-msgstr "Não foi possível obter acesso exclusivo a %s"
+msgid "The method driver %s could not be found."
+msgstr "O driver do método %s não pôde ser encontrado."
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-"Lista de ficheiros que não podem ser criados porque '%s' não é um directório"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "A ignorar '%s' no directório '%s' porque não é um ficheiro normal"
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou correctamente"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"A ignorar o ficheiro '%s' no directório '%s' porque não tem extensão no nome "
-"do ficheiro"
+"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"A ignorar o ficheiro '%s' no directório '%s' porque tem uma extensão "
-"inválida no nome do ficheiro"
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, 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:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "O sub-processo %s recebeu o sinal %u."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, 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:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "O sub-processo %s terminou inesperadamente"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Não foi possível abrir ficheiro o %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Não foi possível abrir o descritor de ficheiro %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Falhou criar subprocesso IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Falhou executar compactador "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "escritos, ainda restam %llu para escrever mas não foi possível"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "Problema ao fechar o ficheiro %s"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problema ao renomear o ficheiro %s para %s"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problema ao remover o link do ficheiro %s"
+"As listas de pacotes ou o ficheiro de status não pôde ser analisado ou "
+"aberto."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problema sincronizando o ficheiro"
+#: apt-pkg/cachefile.cc:98
+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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nenhum keyring instalado em %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "A lista de fontes não pôde ser lida."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Cache de pacotes vazia"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "O ficheiro de cache de pacotes está corrompido"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 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:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "O ficheiro de cache de pacotes está corrompido, é demasiado pequeno"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 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:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Pré-Depende"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Sugere"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Em Conflito"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Substitui"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Estraga"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Aumenta"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "necessário"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "padrão"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "A construir árvore de dependências"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Versões candidatas"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Geração de dependências"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "A ler a informação de estado"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falhou abrir o StateFile %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha escrever ficheiro temporário StateFile %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Linha mal formada %lu na lista de fontes %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "A abrir %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linha %u é demasiado longa na lista de fontes %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Não foi possível proceder à configuração imediata em '%s'. Para detalhes, "
-"por favor veja man 5 apt.conf em APT::Immediate-Configure. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Não pode configurar '%s'. "
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 execução da instalação irá necessitar de remover temporariamente o "
-"pacote essencial %s devido a um loop de Conflitos/Pré-Dependências. Isto "
-"normalmente é mau, mas se você quer realmente fazer isso, active a opção "
-"APT::Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Tipo do ficheiro de índice '%s' não é suportado"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"O pacote %s necessita ser reinstalado, mas não foi possível encontrar um "
-"repositório para o mesmo."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
-"pacotes mantidos (hold)."
-
-#: apt-pkg/algorithms.cc:1070
-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/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Falta directório de listas %spartial."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Falta o directório de arquivos %spartial."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Impossível criar acesso exclusivo ao directório %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "A obter o ficheiro %li de %li (%s restantes)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "A obter o ficheiro %li de %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "O driver do método %s não pôde ser encontrado."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou correctamente"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Sistema de empacotamento '%s' não é suportado"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr ""
-"Não foi possível determinar um tipo de sistema de empacotamento adequado"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Não foi possível fazer stat %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"As listas de pacotes ou o ficheiro de status não pôde ser analisado ou "
-"aberto."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "A lista de fontes não pôde ser lida."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"O valor '%s' é inválido para APT::Default-Release porque tal lançamento não "
-"está disponível nas fontes"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Registo inválido no ficheiro de preferências %s, sem cabeçalho Package"
-
-#: apt-pkg/policy.cc:436
-#, 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:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "A cache possui um sistema de versões incompatível"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Ocorreu um erro ao processar %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
 "suportar."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de versões que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de descrições que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de dependências que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "A ler as listas de pacotes"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "A obter File Provides"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Não conseguiu escrever para %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Erro de I/O ao gravar a cache de código fonte"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Enviar cenário a resolver"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Enviar pedido para resolvedor"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Preparar para receber solução"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Executar resolvedor externo"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falhou renomear, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Código de verificação hash não coincide"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Tamanho incorrecto"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operação %s inválida"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3099,18 +2238,18 @@ msgstr ""
 "Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
 "errada em sources.list ou ficheiro malformado)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Não existe qualquer chave pública disponível para as seguintes IDs de "
 "chave:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3119,12 +2258,12 @@ msgstr ""
 "O ficheiro Release para %s está expirado (inválido desde %s). Não serão "
 "aplicadas as actualizações para este repositório."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3135,12 +2274,12 @@ msgstr ""
 "GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Erro GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3150,12 +2289,12 @@ msgstr ""
 "significar que você precisa corrigir manualmente este pacote. (devido a "
 "arquitectura em falta)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3163,71 +2302,135 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
 "para o pacote %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Não foi possível fazer parse ao ficheiro Release %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "O bloco de fabricante %s não contém a impressão digital"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Nenhuma secção, no ficheiro Release %s"
+msgid "List directory %spartial is missing."
+msgstr "Falta directório de listas %spartial."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Nenhuma entrada hash no ficheiro Release %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Falta o directório de arquivos %spartial."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Entrada inválida, 'Valid-until', no ficheiro de Release: %s"
+msgid "Unable to lock directory %s"
+msgstr "Impossível criar acesso exclusivo ao directório %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "A obter o ficheiro %li de %li (%s restantes)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "O bloco de fabricante %s não contém a impressão digital"
+msgid "Retrieving file %li of %li"
+msgstr "A obter o ficheiro %li de %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Falhou o download de alguns ficheiros de índice. Foram ignorados ou os "
+"antigos foram usados em seu lugar."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"O valor '%s' é inválido para APT::Default-Release porque tal lançamento não "
+"está disponível nas fontes"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Registo inválido no ficheiro de preferências %s, sem cabeçalho Package"
+
+#: apt-pkg/policy.cc:444
+#, 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:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Não foi possível proceder à configuração imediata em '%s'. Para detalhes, "
+"por favor veja man 5 apt.conf em APT::Immediate-Configure. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Não pode configurar '%s'. "
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 execução da instalação irá necessitar de remover temporariamente o "
+"pacote essencial %s devido a um loop de Conflitos/Pré-Dependências. Isto "
+"normalmente é mau, mas se você quer realmente fazer isso, active a opção "
+"APT::Force-LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Linha %u é demasiado longa na lista de fontes %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "A desmontar o CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "A utilizar o ponto de montagem do CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "A desmontar o CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "A aguardar pelo disco...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "A montar o CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "A identificar.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "A identificar... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Label Guardada: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "A desmontar o CD-ROM...\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "A pesquisar os ficheiros de índice do disco...\n"
 
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "A pesquisar os ficheiros de índice do disco..\n"
-
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3236,7 +2439,7 @@ 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:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3244,16 +2447,16 @@ msgstr ""
 "Não foi possível localizar quaisquer ficheiros de pacote, talvez este não "
 "seja um disco Debian ou seja a arquitectura errada?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Encontrada a etiqueta '%s'\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Isso não é um nome válido, tente novamente.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3262,82 +2465,108 @@ msgstr ""
 "Este disco tem o nome: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "A copiar listas de pacotes..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "A escrever lista de novas source\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 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:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Escreveu %i registos.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"O pacote %s necessita ser reinstalado, mas não foi possível encontrar um "
+"repositório para o mesmo."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
+"pacotes mantidos (hold)."
+
+#: apt-pkg/algorithms.cc:1088
+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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "A construir árvore de dependências"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versões candidatas"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Geração de dependências"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "A ler a informação de estado"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n"
+msgid "Failed to open StateFile %s"
+msgstr "Falhou abrir o StateFile %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"Escreveu %i registos com %i ficheiros em falta e %i ficheiros não "
-"coincidentes\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha escrever ficheiro temporário StateFile %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Não foi possível encontrar registo de autenticação para: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash não coincide para: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Não foi encontrado o Release '%s' para '%s'"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Não foi encontrada a versão '%s' para '%s'"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Não foi possível encontrar a tarefa '%s'"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Não foi possível seleccionar versões do pacote '%s' pois é puramente virtual"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3346,176 +2575,242 @@ msgstr ""
 "Não pode seleccionar a versão instalada nem a versão candidata do pacote "
 "'%s' pois não tem nenhuma destas"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Não foi possível seleccionar a versão mais recente a partir do pacote '%s' "
 "já que é puramente virtual"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Não é possível seleccionar a versão candidata do pacote %s já que não tem "
 "candidato"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Não é possível seleccionar a versão instalada do pacote %s pois não está "
 "instalado"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Enviar cenário a resolver"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Não foi possível fazer parse ao ficheiro Release %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Enviar pedido para resolvedor"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Nenhuma secção, no ficheiro Release %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Preparar para receber solução"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Nenhuma entrada hash no ficheiro Release %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Entrada inválida, 'Valid-until', no ficheiro de Release: %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Executar resolvedor externo"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
+
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "A correr o dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
-"Falhou o download de alguns ficheiros de índice. Foram ignorados ou os "
-"antigos foram usados em seu lugar."
+"Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Linha mal formada %lu na lista de fontes %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "A abrir %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "A instalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "A configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "A remover %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "A remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "A notar o desaparecimento de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "A correr o 'trigger' de pós-instalação %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directório '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Não foi possível abrir ficheiro o '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "A preparar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "A desempacotar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "A preparar para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "A preparar a remoção de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "A preparar para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Remoção completa de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Não conseguiu escrever para %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "A operação foi interrompida antes de poder terminar"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependências - deixando por configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3523,7 +2818,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro "
 "de seguimento de um erro anterior."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3531,7 +2826,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
 "cheio"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3539,7 +2834,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
 "memória esgotada"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3548,14 +2843,14 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
 "cheio"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de I/"
 "O do dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3564,7 +2859,7 @@ msgstr ""
 "Não foi possível obter acesso exclusivo ao directório de administração (%s), "
 "outro processo está a utilizá-lo?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3573,7 +2868,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3581,10 +2876,748 @@ msgstr ""
 "O dpkg foi interrompido, para corrigir o problema tem de correr manualmente "
 "'%s'"
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Sem acesso exclusivo"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "A selecção %s não foi encontrada"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+"Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Não foi possível abrir ficheiro de lock %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via "
+"nfs"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Não foi possível obter acesso exclusivo a %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+"Lista de ficheiros que não podem ser criados porque '%s' não é um directório"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "A ignorar '%s' no directório '%s' porque não é um ficheiro normal"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+"A ignorar o ficheiro '%s' no directório '%s' porque não tem extensão no nome "
+"do ficheiro"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"A ignorar o ficheiro '%s' no directório '%s' porque tem uma extensão "
+"inválida no nome do ficheiro"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, 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:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "O sub-processo %s recebeu o sinal %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "O sub-processo %s terminou inesperadamente"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problema ao fechar o ficheiro gzip %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Não foi possível abrir ficheiro o %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Não foi possível abrir o descritor de ficheiro %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Falhou criar subprocesso IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Falhou executar compactador "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "escritos, ainda restam %llu para escrever mas não foi possível"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problema ao fechar o ficheiro %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problema ao renomear o ficheiro %s para %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problema ao remover o link do ficheiro %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problema sincronizando o ficheiro"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Erro !"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Pronto"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Pronto"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Não é possível fazer mmap a um ficheiro vazio"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Não foi possível duplicar o descritor de ficheiro %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Não foi possível fazer mmap de %llu bytes"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Não foi possível fechar mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Não foi sincronizar mmap "
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Não foi possível fazer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Falhou truncar o ficheiro"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::Cache-"
+"Start. Valor actual: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Não foi possível aumentar o tamanho do MMap pois o limite de %lu bytes já "
+"foi alcançado."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Não foi possível aumentar o tamanho do MMap pois o crescimento automático "
+"está desabilitado pelo utilizador."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Impossível executar stat ao ponto de montagem %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Impossível executar stat ao cdrom"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Abreviatura de tipo desconhecida: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "A abrir o ficheiro de configuração %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Erro de sintaxe %s:%u: Tag mal formada"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, 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:897
+#, 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:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Erro de sintaxe %s:%u: directiva clara necessita de uma árvore de opções "
+"como argumento"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, 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"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nenhum keyring instalado em %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Opção '%c' da linha de comandos [de %s] é desconhecida."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Opção %s de linha de comandos não é compreendida"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Opção %s da linha de comandos não é booleana"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "A opção %s necessita de um argumento."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opção %s: Especificação de item de configuração tem de ter um =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Opção %s necessita de um número inteiro como argumento, não '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opção '%s' é demasiado longa"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "O sentido %s não é compreendido, tente verdadeiro ou falso."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Operação %s inválida"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Utilização: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n"
+"\n"
+"O apt-extracttemplates é uma ferramenta para extrair configuração\n"
+"e informação de template de pacotes debian.\n"
+"\n"
+"Opções:\n"
+"  -h   Este texto de ajuda\n"
+"  -t   Definir o directório temporário\n"
+"  -c=? Ler este ficheiro de configuração\n"
+"  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Não foi possível fazer stat %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Não pode obter a versão do debconf. O debconf está instalado?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "A lista de extensão de pacotes é demasiado longa"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Erro ao processar o directório %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Lista de extensão de códigos-fonte é demasiado longa"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Erro ao processar o conteúdo %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Utilização: apt-ftparchive [opções] comando\n"
+"Comandos: packages caminho_binário [ficheiro_override [prefixo_caminho]]\n"
+"          sources caminho_fonte [ficheiro_override [prefixo_caminho]]\n"
+"          contents caminho\n"
+"          release caminho\n"
+"          generate config [grupos]\n"
+"          clean config\n"
+"\n"
+"O apt-ftparchive gera ficheiros de índice para repositórios Debian. Ele \n"
+"suporta muitos estilos de criação, desde totalmente automatizados até \n"
+"substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n"
+"\n"
+"O apt-ftparchive gera ficheiros Packages a partir de uma árvore de .debs.\n"
+" O ficheiro Package contém o conteúdo de todos os campos de controle de \n"
+"cada pacote bem como o hash MD5 e tamanho do ficheiro. É suportado um \n"
+"ficheiro override para forçar o valor de Priority e Section.\n"
+"\n"
+"Similarmente, o apt-ftparchive gera ficheiros Sources a partir de uma \n"
+"árvore de .dscs. A opção --source-override pode ser utilizada para \n"
+"especificar um ficheiro override de fontes\n"
+"\n"
+"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n"
+"árvore. CaminhoBinário deve apontar para a base de procura recursiva \n"
+"e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n"
+"incluído aos campos filename caso esteja presente. Exemplo de uso do \n"
+"repositório Debian :\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opções:\n"
+"   -h    Este texto de ajuda\n"
+"   --md5 Controlar a criação do MD5\n"
+"   -s=?  Ficheiro override de código-fonte \n"
+"   -q    Silencioso\n"
+"   -d=?  Seleccionar a base de dados de caching opcional\n"
+"   --no-delink Habilitar o modo de debug delinking\n"
+"   --contents  Controlar a criação do ficheiro de conteúdo\n"
+"   -c=?  Ler este ficheiro de configuração\n"
+"   -o=?  Definir uma opção de configuração arbitrária"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Nenhuma selecção coincidiu"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "A base de dados é antiga, a tentar actualizar %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"O formato da BD é inválido. Se actualizou a partir de uma versão antiga do "
+"apt, por favor remova-a e crie novamente a base de dados."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "O arquivo não tem registo de controlo"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Não foi possível obter um cursor"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Não foi possível ler o directório %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Não foi possível fazer stat %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Os erros aplicam-se ao ficheiro "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Falhou resolver %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Falhou ao percorrer a árvore"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Falhou abrir %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Falhou o readlink %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Falhou o unlink %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Falhou ligar %s a %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Limite DeLink de %sB atingido.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Arquivo não possuía campo package"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s não possui entrada override\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr " o maintainer de %s é %s, não %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s não possui fonte de entrada de 'override'\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s também não possui entrada binária de 'override'\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Falhou alocar memória"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Não foi possível abrir %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Override %s malformado linha %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Falhou ler o ficheiro override %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Override %s malformado linha %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Override %s malformado linha %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Override %s malformado linha %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmo de compressão desconhecido '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Saída compactada %s precisa de um conjunto de compressão"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Falhou criar FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Falhou o fork"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Compactar filho"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Erro Interno, falhou criar %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Falhou o IO para subprocesso/arquivo"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Falhou ler durante o cálculo de MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problema ao executar unlinking %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Utilização: apt-internal-solver\n"
+"\n"
+"O apt-internal-solver é um interface para utilizar o actual interno como um\n"
+" resolvedor externo para a família APT para depuração ou semelhante.\n"
+"\n"
+"Opções:\n"
+"  -h  Este texto de ajuda.\n"
+"  -q  Saída para registo - sem indicador de progresso\n"
+"  -c=? Ler este ficheiro de configuração\n"
+"  -o=? Definir uma opção de configuração arbitrária, p.e. dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Registo de pacote desconhecido!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Utilização: apt-sortpkgs [opções] ficheiro1 [ficheiro2 ...]\n"
+"\n"
+"O apt-sortpkgs é uma ferramenta simples para ordenar ficheiros de pacotes.\n"
+"A opção -s é utilizada para indicar que tipo de ficheiro é.\n"
+"\n"
+"Opções:\n"
+"  -h   Este texto de ajuda\n"
+"  -s   Utilizar a ordenação de ficheiros de código-fonte\n"
+"  -c=? Ler este ficheiro de configuração\n"
+"  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
+"tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s não é um pacote DEB válido."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 746f78de6..21355434e 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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."
@@ -17,156 +17,157 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Total de Nomes de Pacotes: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Total de Nomes de Pacotes: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Pacotes normais: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Pacotes puramente virtuais: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Pacotes virtuais únicos: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Pacotes virtuais misturados: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Faltando: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Total de versões distintas: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Total de descrições distintas: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Total de dependências: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Total de relações ver/arquivo: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Total de relações Desc/Arquivo: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Total de mapeamentos \"Provides\": "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Total de strings \"globbed\": "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Total de espaço de dependência de versão: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Total de espaço frouxo: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Total de espaço contabilizado para: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O arquivo de pacote %s está fora de sincronia."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Nenhum pacote encontrado"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Você deve passar exatamente um padrão"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossível encontrar o pacote %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Arquivos de pacote:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Pacotes alfinetados (\"pinned\"):"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(não encontrado)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Pacote alfinetado (\"pin\"): "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Tabela de versão:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -241,30 +242,30 @@ msgstr ""
 "tmp\n"
 "Veja as páginas de manual apt-cache(8) e apt.conf(5) para mais informações.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Por favor, forneça um nome para este Disco, algo como 'Debian 2.1r1 Disco 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Por favor, insira um Disco na unidade e pressione enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Falhou ao renomear %s para %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repita este processo para o restante dos CDs em seu conjunto."
 
@@ -302,65 +303,65 @@ msgstr ""
 "  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Impossível achar pacote %s"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Impossível achar pacote %s"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Impossível achar pacote %s"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível achar pacote %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o solucionador de problemas quebrou coisas"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Impossível criar trava no diretório de download"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossível encontrar um pacote fonte para %s"
@@ -380,97 +381,97 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pulando arquivo já baixado '%s'\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, 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:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Preciso obter %sB de arquivos fonte.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Falhou ao buscar alguns arquivos."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Baixar completo e no modo somente baixar (\"download only\")"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando de desempacotamento '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando de construção '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Processo filho falhou"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de construção.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -479,7 +480,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:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -488,14 +489,14 @@ 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:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -504,7 +505,7 @@ 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:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,30 +514,30 @@ 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:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, 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:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Falhou ao processar as dependências de construção"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectando em %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Módulos para os quais há suporte:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -624,53 +625,74 @@ msgstr ""
 "para mais informações e opções.\n"
 "                       Este APT tem Poderes de Super Vaca.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "mas não está instalado"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s já é a versão mais nova.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s já é a versão mais nova.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperado %s mas este não estava lá"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Falhou ao abrir %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -697,7 +719,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -745,52 +767,52 @@ msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
 msgid "Disk not found."
 msgstr "Disco não encontrado."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Arquivo não encontrado"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Falhou ao executar \"stat\""
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Falhou ao definir hora de modificação"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI inválida, URIs locais não devem iniciar com //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Impossível determinar o nome do ponto"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Impossível determinar o nome local"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "O servidor recusou a conexão e disse: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER falhou, servidor disse: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS falhou, servidor disse: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -798,121 +820,123 @@ msgstr ""
 "Um servidor proxy foi especificado mas não um script de login, Acquire::ftp::"
 "ProxyLogin está vazio."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Comando de script de login '%s' falhou, servidor disse: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE falhou, servidor disse: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Conexão expirou"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Servidor fechou a conexão"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Uma resposta sobrecarregou o buffer"
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Corrupção de protocolo"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Erro de escrita"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Não foi possível criar um socket"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Não foi possível conectar um socket de dados, conexão expirou"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Falhou"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Não foi possível conectar um socket passivo."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo não foi capaz de obter um socket de escuta"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Não foi possível fazer \"bind\" de um socket"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Não foi possível ouvir no socket"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Não foi possível determinar o nome do socket"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Impossível enviar o comando PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Família de endereços %u desconhecida (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falhou, servidor disse: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Conexão do socket de dados expirou"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar conexão"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problema criando o hash do arquivo"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossível obter arquivo, servidor disse '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Socket de dados expirou"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Transferência de dados falhou, servidor disse '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Pesquisa"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Impossível invocar "
 
@@ -948,7 +972,7 @@ msgstr "Não foi possível conectar em %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
@@ -978,18 +1002,18 @@ 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:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Ao menos uma assinatura inválida foi encontrada."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
@@ -997,22 +1021,22 @@ msgstr ""
 "instalado?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido executando gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram inválidas:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1020,117 +1044,352 @@ msgstr ""
 "As assinaturas a seguir não puderam ser verificadas devido à chave pública "
 "não estar disponível:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Erro escrevendo para o arquivo"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Erro escrevendo para arquivo"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Seleção falhou"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Conexão expirou"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Erro escrevendo para arquivo de saída"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Aguardando por cabeçalhos"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Linha de cabeçalho ruim"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor HTTP enviou um cabeçalho \"Content-Length\" inválido"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou um cabeçalho \"Content-Range\" inválido"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Dados de cabeçalho ruins"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calculando atualização... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Erro interno, AllUpgrade quebrou coisas"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Pronto"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Corrigindo dependências..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falhou."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Impossível corrigir dependências"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossível minimizar o conjunto de atualizações"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Pronto"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependências desencontradas. Tente usar -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Os pacotes a seguir têm dependências desencontradas:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "mas %s está instalado"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mas %s está para ser instalado"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "mas não é instalável"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "mas é um pacote virtual"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "mas não está instalado"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "mas não será instalado"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Os NOVOS pacotes a seguir serão instalados:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Os pacotes a seguir serão REMOVIDOS:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Os pacotes a seguir serão atualizados:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Os pacotes a seguir serão REVERTIDOS:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Os seguintes pacotes mantidos serão mudados:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por causa de %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISO: Os pacotes essenciais a seguir serão removidos.\n"
+"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
+"fazendo!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu revertidos, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu a serem removidos e %lu não atualizados.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erro de compilação de regex - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "O comando update não leva argumentos"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, Ordenação não finalizou"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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."
+"Que estranho... Os tamanhos não batem, mande e-mail para apt@packages.debian."
 "org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "É preciso baixar %sB/%sB de arquivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "É preciso baixar %sB de arquivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1138,31 +1397,31 @@ msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Você não possui espaço suficiente em %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Há problemas e -y foi usado sem --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "\"Trivial Only\" especificado mas esta não é uma operação trivial."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Sim, faça o que eu digo!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1173,19 +1432,19 @@ msgstr ""
 "Para continuar digite a frase '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Abortar."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Você quer continuar?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Alguns arquivos falharam ao baixar"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1193,19 +1452,19 @@ msgstr ""
 "Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar "
 "com --fix-missing?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing e troca de mídia não são suportados atualmente"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Impossível corrigir pacotes faltantes."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Abortando instalação."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1215,15 +1474,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 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"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1241,15 +1500,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "A informação a seguir pode ajudar a resolver a situação:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover quebrou coisas"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1263,7 +1522,7 @@ msgstr[1] ""
 "Os seguintes pacotes foram automaticamente instalados e não são mais "
 "requeridos:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1275,18 +1534,18 @@ msgstr[1] ""
 "Os seguintes pacotes foram automaticamente instalados e não são mais "
 "requeridos:"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Use 'apt-get autoremove' para removê-los."
 msgstr[1] "Use 'apt-get autoremove' para removê-los."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1294,7 +1553,7 @@ msgstr ""
 "Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1306,319 +1565,92 @@ msgstr ""
 "distribuição instável, que alguns pacotes requeridos não foram\n"
 "criados ainda ou foram retirados da \"Incoming\"."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Pacotes quebrados"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Os pacotes extra a seguir serão instalados:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticação sobreposto.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Alguns pacotes não puderam ser autenticados"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Instalar estes pacotes sem verificação?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou ao buscar %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Os pacotes a seguir têm dependências desencontradas:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "mas %s está instalado"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mas %s está para ser instalado"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "mas não é instalável"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "mas é um pacote virtual"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "mas não está instalado"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "mas não será instalado"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Os NOVOS pacotes a seguir serão instalados:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Os pacotes a seguir serão REMOVIDOS:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Os pacotes a seguir serão atualizados:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Os pacotes a seguir serão REVERTIDOS:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Os seguintes pacotes mantidos serão mudados:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (por causa de %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISO: Os pacotes essenciais a seguir serão removidos.\n"
-"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
-"fazendo!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu revertidos, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu a serem removidos e %lu não atualizados.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erro de compilação de regex - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Corrigindo dependências..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Impossível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossível minimizar o conjunto de atualizações"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Pronto"
-
-#: apt-private/private-cachefile.cc:102
-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."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependências desencontradas. Tente usar -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "O comando update não leva argumentos"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Calculando atualização... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Erro interno, AllUpgrade quebrou coisas"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Pronto"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Falha ao baixar %s  %s\n"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Atingido "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Obter:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Baixados %sB em %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Trabalhando]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1631,19 +1663,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossível ler %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Impossível mudar para %s"
@@ -1672,11 +1704,11 @@ msgstr "Não foi possível abrir arquivo %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Falhou ao criar pipe IPC para sub-processo"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Conexão encerrada prematuramente"
 
@@ -1722,1365 +1754,484 @@ msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente"
 msgid "Merging available information"
 msgstr "Mesclando informação disponível"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
-"\n"
-"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n"
-"(\"template\") e configuração de pacotes debian.\n"
-"\n"
-"Opções:\n"
-"  -h   Este texto de ajuda\n"
-"  -t   Define o diretório temporário\n"
-"  -c=? Lê o arquivo de configuração especificado.\n"
-"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Impossível escrever para %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Lista de extensão de pacotes é muito extensa"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Erro processando o diretório %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Lista de extensão de fontes é muito extensa"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Erro processando conteúdo %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 [opções] comando\n"
-"Comandos: packages caminho_binário [arquivo_override [prefixo_caminho]]\n"
-"          sources caminho_fonte [arquivo_override [prefixo_caminho]]\n"
-"          contents caminho\n"
-"          release caminho\n"
-"          generate config [grupos]\n"
-"          clean config\n"
-"\n"
-"O apt-ftparchive gera arquivos de índice para repositórios Debian. Ele\n"
-"dá suporte a muitos estilos de geração, desde totalmente automatizadas até\n"
-"substitutos funcionais para o dpkg-scanpackages e o dpkg-scansources\n"
-"\n"
-"O apt-ftparchive gera arquivos Package a partir de uma árvore de .debs.\n"
-"O arquivo Package contém o conteúdo de todos os campos controle de\n"
-"cada pacote bem como o hash MD5 e o tamanho do arquivo. Há suporte para\n"
-"um arquivo override para forçar o valor da prioridade (\"Priority\") e a\n"
-"a seção (\"Section\").\n"
-"\n"
-"Similarmente, o apt-ftparchive gera arquivos Sources a partir de uma\n"
-"árvore de .dscs. A opção --source-override pode ser usada para\n"
-"especificar um arquivo override de fontes.\n"
-"\n"
-"Os comandos 'packages' e 'sources' deverão ser executados na raiz da\n"
-"árvore. Caminho_Binário deverá apontar para a base de procura recursiva\n"
-"e o arquivo override deverá conter as \"flags override\". Caminho_Prefixo é\n"
-"anexado aos campos do nome do arquivo se estiverem presentes. Exemplo de\n"
-"uso do repositório Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opções:\n"
-"  -h    Este texto de ajuda\n"
-"  --md5 Controla a geração de MD5\n"
-"  -s=?  Arquivo fonte (\"source\") override\n"
-"  -q    Quieto\n"
-"  -d=?  Seleciona o banco de dados de caching opcional\n"
-"  --no-delink Habilita o modo de depuração \"delinking\"\n"
-"  --contents  Controla a geração do arquivo de conteúdo\n"
-"  -c=? Lê o arquivo de configuração especificado.\n"
-"  -o=? Define uma opção de configuração arbitrária"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Nenhuma seleção combinou"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Alguns arquivos estão faltando no grupo de arquivos do pacotes '%s'"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "BD estava corrompido, arquivo renomeado para %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "BD é antigo, tentando atualizar %s"
-
-#: ftparchive/cachedb.cc:76
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do "
-"apt, por favor, remova e recrie o banco de dados."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Impossível abrir o arquivo BD %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Falhou ao executar \"stat\" %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Repositório não possui registro de controle"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Impossível obter um cursor"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Impossível ler o diretório %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Impossível executar \"stat\" em %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Erros que se aplicam ao arquivo "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Falhou ao resolver %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Falhou ao percorrer a árvore"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Falhou ao abrir %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Falhou ao executar \"readlink\" %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Falhou ao executar \"unlink\" %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Falhou ao ligar %s a %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Limite DeLink de %sB atingido.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Repositório não possuía campo pacote"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s não possui entrada override\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  mantenedor de %s é %s, não %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s não possui entrada override fonte\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s também não possui entrada override binária\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Falha ao alocar memória"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Impossível abrir %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Override malformado %s linha %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Falha ao ler o arquivo override %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Override malformado %s linha %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Override malformado %s linha %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Override malformado %s linha %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo de compactação desconhecido '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Saída compactada %s precisa de um conjunto de compactação"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Falhou ao criar FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Falhou ao executar \"fork\""
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Compactar filho"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Erro interno, falhou ao criar %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "E/S para sub-processo/arquivo falhou"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Falhou ao ler durante o cálculo MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema removendo %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Falhou ao renomear %s para %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
-"\n"
-"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n"
-"(\"template\") e configuração de pacotes debian.\n"
-"\n"
-"Opções:\n"
-"  -h   Este texto de ajuda\n"
-"  -t   Define o diretório temporário\n"
-"  -c=? Lê o arquivo de configuração especificado.\n"
-"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Registro de pacote desconhecido!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Uso: apt-sortpkgs [opções] arquivo1 [arquivo2 ...]\n"
-"\n"
-"O apt-sortpkgs é uma ferramenta simples para ordenar arquivos de pacote.\n"
-"A opção -s é usada para indicar que tipo de arquivo é.\n"
-"\n"
-"Opções:\n"
-"  -h   Este texto de ajuda\n"
-"  -s   Usar ordenação de arquivo fonte\n"
-"  -c=? Lê o arquivo de configuração especificado.\n"
-"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
-"tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Falhou ao criar \"pipes\""
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Falhou ao executar gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Arquivo corrompido"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Assinatura de arquivo inválida"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Erro na leitura de cabeçalho membro de arquivo"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Cabeçalho membro de arquivo inválido"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Cabeçalho membro de arquivo inválido"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arquivo é muito pequeno"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Falhou ao ler os cabeçalhos do arquivo"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "\"DropNode\" chamado em nó ainda ligado (\"linked\")"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Falhou ao localizar o elemento hash!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Falhou ao alocar desvio (\"diversion\")"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Erro interno em \"AddDiversion\""
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Adição dupla de desvio %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Arquivo de configuração duplicado %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Falhou ao escrever arquivo %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Falhou ao fechar arquivo %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "O caminho %s é muito longo"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Desempacotando %s mais de uma vez"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "O diretório %s é desviado (\"diverted\")"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "O pacote está tentando escrever no alvo do desvio %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "O caminho de desvio é muito longo"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Falhou ao executar \"stat\" %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Falhou ao renomear %s para %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "O diretório %s está sendo substituído por um não-diretório"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Falha ao localizar nó em seu \"hash bucket\""
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "O caminho é muito longo"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Sobrescrita de pacote não combina com nenhuma versão para %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Impossível executar \"stat\" em %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Falhou ao escrever arquivo %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Falhou ao fechar arquivo %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Este não é um arquivo DEB válido, membro '%s' faltando"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Erro interno, não foi possível localizar membro %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Arquivo de controle não interpretável"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Assinatura de arquivo inválida"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Não foi possível abrir \"pipe\" para %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Erro na leitura de cabeçalho membro de arquivo"
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Não foi possível fazer \"mmap\" de %lu bytes"
+msgid "Invalid archive member header %s"
+msgstr "Cabeçalho membro de arquivo inválido"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Impossível abrir %s"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Cabeçalho membro de arquivo inválido"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Impossível invocar "
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arquivo é muito pequeno"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Não foi possível fazer \"mmap\" de %lu bytes"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Falhou ao ler os cabeçalhos do arquivo"
 
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Falhou ao truncar arquivo"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Falhou ao criar \"pipes\""
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Falhou ao executar gzip "
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Arquivo corrompido"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "Impossível executar \"stat\" %s."
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%limin %lis"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Seleção %s não encontrada"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Abreviação de tipo desconhecida: '%c'"
-
-#: apt-pkg/contrib/configuration.cc:617
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Abrindo arquivo de configuração %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, 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:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Erro de sintaxe %s:%u: Tag mal formada"
+msgid "Packaging system '%s' is not supported"
+msgstr "Sistema de empacotamento '%s' não é suportado"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Impossível determinar um tipo de sistema de empacotamento aplicável."
 
-#: apt-pkg/contrib/configuration.cc:861
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, 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"
+msgid "Wrote %i records.\n"
+msgstr "Gravados %i registros.\n"
 
-#: apt-pkg/contrib/configuration.cc:868
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Erro de sintaxe %s:%u: Muitos \"includes\" aninhados"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Gravados %i registros com %i arquivos faltando.\n"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Gravados %i registros com %i arquivos que não combinam\n"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, 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:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Erro!"
+"Gravados %i registros com %i arquivos faltando e %i arquivos que não "
+"combinam\n"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Pronto"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Pronto"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Opção de linha de comando '%c' [de %s] é desconhecida."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Opção de linha de comando %s não é compreendida"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Opção de linha de comando %s não é booleana"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Opção %s requer um argumento."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-"Opção %s: Especificação de item de configuração deve possuir um =<val>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Opção %s requer um argumento inteiro, não '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Opção '%s' é muito longa"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Sentido %s não é compreendido, tente verdadeiro ou falso."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Operação %s inválida"
+msgid "Hash mismatch for: %s"
+msgstr "Hash Sum incorreto"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Impossível executar \"stat\" no ponto de montagem %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Impossível executar \"stat\" no cdrom"
+msgid "The method driver %s could not be found."
+msgstr "O driver do método %s não pode ser encontrado."
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problema fechando o arquivo"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Não usando travamento para arquivo de trava somente leitura %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Não foi possível abrir arquivo de trava %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Não usando travamento para arquivo de trava montado via nfs %s"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Não foi possível obter trava %s"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgid "Is the package %s installed?"
+msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou corretamente"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+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/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
+"As listas de pacotes ou os arquivos de estado não puderam ser analisados ou "
+"abertos."
 
-#: apt-pkg/contrib/fileutl.cc:862
-#, 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:864
-#, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Sub-processo %s recebeu uma falha de segmentação."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, 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:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Sub-processo %s finalizou inesperadamente"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Não foi possível abrir arquivo %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Não foi possível abrir \"pipe\" para %s"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Falhou ao criar sub-processo IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Falhou ao executar compactador "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "escrita, ainda restam %lu para gravar mas não foi possível"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Problema fechando o arquivo"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problema sincronizando o arquivo"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problema removendo o arquivo"
-
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problema sincronizando o arquivo"
+#: apt-pkg/cachefile.cc:98
+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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abortando instalação."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "A lista de fontes não pode ser lida."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Cache de pacotes vazio"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "O arquivo de cache de pacotes está corrompido"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 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:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "O arquivo de cache de pacotes está corrompido"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 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:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Pré-Depende"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Sugere"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Conflita"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Substitui"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Quebra"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "requerido"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "padrão"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Construindo árvore de dependências"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Versões candidatas"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Geração de dependência"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Lendo informação de estado"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Impossível analisar arquivo de pacote %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Impossível analisar arquivo de pacote %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Abrindo %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linha %u muito longa na lista de fontes %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Não foi possível abrir arquivo %s"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 execução de instalação requererá a remoção temporária do pacote "
-"essencial %s devido a um loop de Conflitos/Pré-Dependências. Isso geralmente "
-"é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-"
-"LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Tipo de arquivo de índice '%s' não é suportado"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
-"arquivo para o mesmo."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
-"pacotes mantidos (hold)."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Diretório de listas %spartial está faltando."
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Diretório de arquivos %spartial está faltando."
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Impossível criar trava no diretório de listas"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Obtendo o arquivo %li de %li (%s restantes)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Obtendo arquivo %li de %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "O driver do método %s não pode ser encontrado."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou corretamente"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Sistema de empacotamento '%s' não é suportado"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Impossível determinar um tipo de sistema de empacotamento aplicável."
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossível executar \"stat\" %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"As listas de pacotes ou os arquivos de estado não puderam ser analisados ou "
-"abertos."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "A lista de fontes não pode ser lida."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-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:436
-#, 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:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\""
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "O cache possui um sistema de versões incompatível"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
 "suportar."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de versões que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de descrições que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de dependências que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Pacote %s %s não foi encontrado enquanto processando dependências de arquivo"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Lendo listas de pacotes"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Coletando Arquivo \"Provides\""
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Impossível escrever para %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Erro de E/S ao gravar cache fonte"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "renomeação falhou, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum incorreto"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Tamanho incorreto"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operação %s inválida"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Impossível analisar arquivo de pacote %s (1)"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3088,12 +2239,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3103,12 +2254,12 @@ msgstr ""
 "que você precisa consertar manualmente este pacote. (devido a arquitetura "
 "não especificada)."
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3116,71 +2267,132 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
 "\" para o pacote %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossível analisar arquivo de pacote %s (1)"
+msgid "List directory %spartial is missing."
+msgstr "Diretório de listas %spartial está faltando."
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Nota, selecionando %s ao invés de %s\n"
+msgid "Archives directory %spartial is missing."
+msgstr "Diretório de arquivos %spartial está faltando."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Impossível criar trava no diretório de listas"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Obtendo o arquivo %li de %li (%s restantes)"
+
+#: apt-pkg/acquire.cc:901
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Obtendo arquivo %li de %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
+"Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os "
+"antigos foram usados no lugar."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Linha inválida no arquivo de desvios: %s"
+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:444
+#, 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:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Impossível analisar arquivo de pacote %s (1)"
+msgid "Could not configure '%s'. "
+msgstr "Não foi possível abrir arquivo %s"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")"
+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 execução de instalação requererá a remoção temporária do pacote "
+"essencial %s devido a um loop de Conflitos/Pré-Dependências. Isso geralmente "
+"é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-"
+"LoopBreak."
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Linha %u muito longa na lista de fontes %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Desmontando CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Usando ponto de montagem de CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Desmontando CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Aguardando por disco...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Montando CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "Identificando.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "Identificando... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Rótulo armazenado: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Desmontando CD-ROM...\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "Procurando por arquivos de índice no disco...\n"
 
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "Procurando por arquivos de índice no disco..\n"
-
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3189,22 +2401,22 @@ 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:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Rótulo encontrado: '%s'\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Este não é um nome válido, tente novamente.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3213,304 +2425,1125 @@ msgstr ""
 "Esse disco é chamado: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Copiando lista de pacotes..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Gravando nova lista de fontes\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 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:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Gravados %i registros.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
+"arquivo para o mesmo."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Gravados %i registros com %i arquivos faltando.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
+"pacotes mantidos (hold)."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo árvore de dependências"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versões candidatas"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Geração de dependência"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lendo informação de estado"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Gravados %i registros com %i arquivos que não combinam\n"
+msgid "Failed to open StateFile %s"
+msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"Gravados %i registros com %i arquivos faltando e %i arquivos que não "
-"combinam\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+msgid "Unable to parse package file %s (1)"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash Sum incorreto"
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Impossível analisar arquivo de pacote %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' para '%s' não foi encontrada"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versão '%s' para '%s' não foi encontrada"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Impossível achar tarefa %s"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Impossível achar pacote %s"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Impossível achar pacote %s"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Nota, selecionando %s ao invés de %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Linha inválida no arquivo de desvios: %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
-"Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os "
-"antigos foram usados no lugar."
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Abrindo %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Removendo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s completamente removido"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Executando gatilho pós-instalação %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Diretório '%s' está faltando"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Não foi possível abrir arquivo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempacotando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparando para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparando para a remoção de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparando para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s completamente removido"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Impossível escrever para %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Impossível criar trava no diretório de listas"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Seleção %s não encontrada"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Não usando travamento para arquivo de trava somente leitura %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Não foi possível abrir arquivo de trava %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Não usando travamento para arquivo de trava montado via nfs %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Não foi possível obter trava %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, 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:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Sub-processo %s recebeu uma falha de segmentação."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Sub-processo %s finalizou inesperadamente"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problema fechando o arquivo"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Não foi possível abrir arquivo %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Não foi possível abrir \"pipe\" para %s"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Falhou ao criar sub-processo IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Falhou ao executar compactador "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "escrita, ainda restam %lu para gravar mas não foi possível"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problema fechando o arquivo"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problema sincronizando o arquivo"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problema removendo o arquivo"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problema sincronizando o arquivo"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Erro!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Pronto"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Pronto"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Não foi possível abrir \"pipe\" para %s"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Não foi possível fazer \"mmap\" de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Impossível abrir %s"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Impossível invocar "
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Não foi possível fazer \"mmap\" de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Falhou ao truncar arquivo"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Impossível executar \"stat\" no ponto de montagem %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Impossível executar \"stat\" no cdrom"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Abreviação de tipo desconhecida: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Abrindo arquivo de configuração %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Erro de sintaxe %s:%u: Tag mal formada"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, 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:897
+#, 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:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, 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"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortando instalação."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Opção de linha de comando '%c' [de %s] é desconhecida."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Opção de linha de comando %s não é compreendida"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Opção de linha de comando %s não é booleana"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Opção %s requer um argumento."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"Opção %s: Especificação de item de configuração deve possuir um =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Opção %s requer um argumento inteiro, não '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opção '%s' é muito longa"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Sentido %s não é compreendido, tente verdadeiro ou falso."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Operação %s inválida"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
+"\n"
+"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n"
+"(\"template\") e configuração de pacotes debian.\n"
+"\n"
+"Opções:\n"
+"  -h   Este texto de ajuda\n"
+"  -t   Define o diretório temporário\n"
+"  -c=? Lê o arquivo de configuração especificado.\n"
+"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Impossível executar \"stat\" em %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Lista de extensão de pacotes é muito extensa"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Erro processando o diretório %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Lista de extensão de fontes é muito extensa"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Erro processando conteúdo %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 [opções] comando\n"
+"Comandos: packages caminho_binário [arquivo_override [prefixo_caminho]]\n"
+"          sources caminho_fonte [arquivo_override [prefixo_caminho]]\n"
+"          contents caminho\n"
+"          release caminho\n"
+"          generate config [grupos]\n"
+"          clean config\n"
+"\n"
+"O apt-ftparchive gera arquivos de índice para repositórios Debian. Ele\n"
+"dá suporte a muitos estilos de geração, desde totalmente automatizadas até\n"
+"substitutos funcionais para o dpkg-scanpackages e o dpkg-scansources\n"
+"\n"
+"O apt-ftparchive gera arquivos Package a partir de uma árvore de .debs.\n"
+"O arquivo Package contém o conteúdo de todos os campos controle de\n"
+"cada pacote bem como o hash MD5 e o tamanho do arquivo. Há suporte para\n"
+"um arquivo override para forçar o valor da prioridade (\"Priority\") e a\n"
+"a seção (\"Section\").\n"
+"\n"
+"Similarmente, o apt-ftparchive gera arquivos Sources a partir de uma\n"
+"árvore de .dscs. A opção --source-override pode ser usada para\n"
+"especificar um arquivo override de fontes.\n"
+"\n"
+"Os comandos 'packages' e 'sources' deverão ser executados na raiz da\n"
+"árvore. Caminho_Binário deverá apontar para a base de procura recursiva\n"
+"e o arquivo override deverá conter as \"flags override\". Caminho_Prefixo é\n"
+"anexado aos campos do nome do arquivo se estiverem presentes. Exemplo de\n"
+"uso do repositório Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opções:\n"
+"  -h    Este texto de ajuda\n"
+"  --md5 Controla a geração de MD5\n"
+"  -s=?  Arquivo fonte (\"source\") override\n"
+"  -q    Quieto\n"
+"  -d=?  Seleciona o banco de dados de caching opcional\n"
+"  --no-delink Habilita o modo de depuração \"delinking\"\n"
+"  --contents  Controla a geração do arquivo de conteúdo\n"
+"  -c=? Lê o arquivo de configuração especificado.\n"
+"  -o=? Define uma opção de configuração arbitrária"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Nenhuma seleção combinou"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Alguns arquivos estão faltando no grupo de arquivos do pacotes '%s'"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "BD estava corrompido, arquivo renomeado para %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "BD é antigo, tentando atualizar %s"
+
+#: ftparchive/cachedb.cc:80
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do "
+"apt, por favor, remova e recrie o banco de dados."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Impossível abrir o arquivo BD %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Repositório não possui registro de controle"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Impossível obter um cursor"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Impossível ler o diretório %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Impossível executar \"stat\" em %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Erros que se aplicam ao arquivo "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Falhou ao resolver %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Falhou ao percorrer a árvore"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Falhou ao abrir %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Falhou ao executar \"readlink\" %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Falhou ao executar \"unlink\" %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Falhou ao ligar %s a %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Limite DeLink de %sB atingido.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Repositório não possuía campo pacote"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s não possui entrada override\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  mantenedor de %s é %s, não %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s não possui entrada override fonte\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s também não possui entrada override binária\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Falha ao alocar memória"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Impossível abrir %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Override malformado %s linha %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Falha ao ler o arquivo override %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Override malformado %s linha %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Override malformado %s linha %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Override malformado %s linha %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmo de compactação desconhecido '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Saída compactada %s precisa de um conjunto de compactação"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Falhou ao criar FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Falhou ao executar \"fork\""
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Compactar filho"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Erro interno, falhou ao criar %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "E/S para sub-processo/arquivo falhou"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Falhou ao ler durante o cálculo MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problema removendo %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
+"\n"
+"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n"
+"(\"template\") e configuração de pacotes debian.\n"
+"\n"
+"Opções:\n"
+"  -h   Este texto de ajuda\n"
+"  -t   Define o diretório temporário\n"
+"  -c=? Lê o arquivo de configuração especificado.\n"
+"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Registro de pacote desconhecido!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Uso: apt-sortpkgs [opções] arquivo1 [arquivo2 ...]\n"
+"\n"
+"O apt-sortpkgs é uma ferramenta simples para ordenar arquivos de pacote.\n"
+"A opção -s é usada para indicar que tipo de arquivo é.\n"
+"\n"
+"Opções:\n"
+"  -h   Este texto de ajuda\n"
+"  -s   Usar ordenação de arquivo fonte\n"
+"  -c=? Lê o arquivo de configuração especificado.\n"
+"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
+"tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s não é um pacote DEB válido."
 
diff --git a/po/ro.po b/po/ro.po
index 2b9872364..e42b8c4ac 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -19,155 +19,156 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Total nume pachete : "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Total nume pachete : "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Pachete normale: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Pachete virtuale pure: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Pachete virtuale singulare: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Pachete virtuale mixte: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Lipsă: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Total versiuni distincte: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Numărul total de descrieri distincte: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Total dependențe: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Total relații versiune/fișier: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Total relații desc/fișier: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Total cartări Furnizează: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Total șiruri înglobate: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Total spațiu versiuni ale dependențelor: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Total spațiu intern: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Total spațiu contorizat pentru: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Fișierul pachetului %s este desincronizat."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Nu s-au găsit pachete"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Trebuie să dați exact un șablon"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nu s-a putut localiza pachetul %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Fișiere pachet: "
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Pachete alese special:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(negăsit)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Instalat: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Candidează: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(niciunul)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Pachet ales special: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Tabela de versiuni:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -240,29 +241,29 @@ msgstr ""
 "  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
 "Vedeți manualele apt-cache(8) și apt.conf(5) pentru mai multe informații.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Furnizați un nume pentru acest disc, de exemplu „Debian 2.1r1 Disk 1”"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Introduceți un disc în unitate și apăsați Enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Eșec la redenumirea lui %s în %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repetați această procedură pentru restul CD-urilor din set."
 
@@ -299,66 +300,66 @@ msgstr ""
 "  -c=? Citește acest fișier de configurare\n"
 "  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Nu pot găsi pachetul %s"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Nu pot găsi pachetul %s"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Nu pot găsi pachetul %s"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Nu pot determina starea listei surse de pachete %s"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nu pot găsi pachetul %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Nu s-a putut bloca directorul de descărcare"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
@@ -378,97 +379,97 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Sar peste fișierul deja descărcat '%s'\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "N-am putut determina spațiul disponibil în %s"
 
-#: cmdline/apt-get.cc:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, 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:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Aducere sursa %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Eșec la aducerea unor arhive."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Descărcare completă și în modul doar descărcare"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comanda de despachetare '%s' eșuată.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comanda de construire '%s' eșuată.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Procesul copil a eșuat"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nu are dependențe înglobate.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -477,7 +478,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:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -486,14 +487,14 @@ msgstr ""
 "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
 "poate fi găsit"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -502,7 +503,7 @@ 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:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -511,30 +512,30 @@ msgstr ""
 "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
 "poate fi găsit"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, 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:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Eșec la prelucrarea dependențelor de compilare"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectare la %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Module suportate:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -623,53 +624,74 @@ msgstr ""
 "pentru mai multe informații și opțiuni.\n"
 "                       Acest APT are puterile unei Super Vaci.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "dar nu este instalat"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s este deja la cea mai nouă versiune.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s este deja la cea mai nouă versiune.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Așteptat %s, dar n-a fost acolo"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Eșec la „open” pentru %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -696,7 +718,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -744,52 +766,52 @@ msgstr "Nu se poate demonta CD-ul din %s, poate este încă utilizat."
 msgid "Disk not found."
 msgstr "Disc negăsit."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Fișier negăsit"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Eșec la „stat”"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Eșec la ajustarea timpului de modificare"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI invalid, URI-uile locale trebuie să nu înceapă cu //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Se autentifică"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Nu se poate detecta numele perechii"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Nu s-a putut detecta numele local"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Serverul a refuzat conexiunea și a spus: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "„USER” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "„PASS” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -797,123 +819,125 @@ msgstr ""
 "Un server proxy a fost precizat, dar nu există nici un script de conectare, "
 "Acquire::ftp::ProxyLogin este gol."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Scriptul „%s” cu comenzile de conectare a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "„TYPE” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Timpul de conectare a expirat"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Serverul a închis conexiunea"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Eroare de citire"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Un răspuns a depășit zona de tampon."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Protocol corupt"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Eroare de scriere"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Nu s-a putut crea un socket"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a "
 "expirat"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Eșec"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Nu s-a putut realiza conectarea la un socket pasiv"
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "„getaddrinfo” n-a reușit să obțină un socket de ascultare"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Nu s-a putut realiza asocierea la un socket"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Nu s-a putut asculta pe socket"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Nu s-a putut detecta numele socket-ului"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Nu s-a putut trimite comanda PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Familie de adrese necunoscută %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "„EPRT” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Timpul de conectare la socket-ul de date expirat"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Nu s-a putut accepta conexiune"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problemă la calcularea dispersiei pentru fișierul"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nu s-a putut aduce fișierul, serverul a spus „%s”"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Timp expirat pentru socket-ul de date"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Transferul de date a eșuat, serverul a spus: '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Interogare"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Nu s-a putut invoca"
 
@@ -950,7 +974,7 @@ msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectare la %s"
@@ -980,40 +1004,40 @@ 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:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Eroare necunoscută în timp ce se execută gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Următoarele semnături nu au fost valide:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1021,149 +1045,385 @@ msgstr ""
 "Următoarele semnături n-au putut fi verificate, deoarece cheia publică nu "
 "este disponibilă:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Eroare la scrierea în fișierul"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 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:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Eroare la citirea de la server"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Eroare la scrierea în fișier"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Selecția a eșuat"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Timp de conectare expirat"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Eroare la scrierea fișierului de rezultat"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "În așteptarea antetelor"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Linie de antet necorespunzătoare"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serverul HTTP a trimis un antet zonă de conținut necorespunzător"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Acest server HTTP are un suport defect de intervale"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Format dată necunoscut"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Antet de date necorespunzător"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Conectare eșuată"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Eroare internă"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calculez înnoirea... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Terminat"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Corectez dependențele..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " eșec."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nu s-au putut corecta dependențele"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Terminat"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependențe neîndeplinite. Încercați să folosiți -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Următoarele pachete au dependențe neîndeplinite:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "dar %s este instalat"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "dar %s este pe cale de a fi instalat"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "dar nu este instalabil"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "dar este un pachet virtual"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "dar nu este instalat"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "dar nu este pe cale să fie instalat"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " sau"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Următoarele pachete NOI vor fi instalate:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Următoarele pachete vor fi ȘTERSE:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Următoarele pachete au fost reținute:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Următoarele pachete vor fi ÎNNOITE:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Următoarele pachete vor fi DE-GRADATE:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Următoarele pachete ținute vor fi schimbate:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (datorită %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu înnoite, %lu nou instalate, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalate, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu de-gradate, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu de șters și %lu neînnoite.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu instalate sau șterse incomplet.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Eroare de compilare expresie regulată - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Comanda de actualizare nu are argumente"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Eroare internă, Ordering nu s-a terminat"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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"
+"Ce ciudat... Dimensiunile nu se potrivesc, scrieți la apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Este nevoie să descărcați %sB/%sB de arhive.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Este nevoie să descărcați %sB de arhive.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Nu aveți suficient spațiu în %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Da, fă cum îți spun!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1174,19 +1434,19 @@ msgstr ""
 "Pentru a continua tastați fraza '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Renunțare."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Vreți să continuați?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Descărcarea unor fișiere a eșuat"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1194,19 +1454,19 @@ 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?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Nu pot corecta pachetele lipsă."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Abandonez instalarea."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1217,16 +1477,16 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
 # XXX: orice sugestie este bine-venită
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 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"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1245,15 +1505,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1267,7 +1527,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1279,7 +1539,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
@@ -1287,11 +1547,11 @@ msgstr[0] "Folosiți 'apt-get autoremove' pentru a le șterge."
 msgstr[1] "Folosiți 'apt-get autoremove' pentru a le șterge."
 msgstr[2] "Folosiți 'apt-get autoremove' pentru a le șterge."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1299,7 +1559,7 @@ msgstr ""
 "Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet "
 "(sau oferiți o altă soluție)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1312,319 +1572,92 @@ msgstr ""
 "pachete\n"
 "cerute n-au fost create încă sau au fost mutate din Incoming."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Pachete deteriorate"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Următoarele extra pachete vor fi instalate:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Pachete sugerate:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Pachete recomandate:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Avertisment de autentificare înlocuit.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Unele pachete n-au putut fi autentificate"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Instalați aceste pachete fără verificare?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Eșec la aducerea lui %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Următoarele pachete au dependențe neîndeplinite:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "dar %s este instalat"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "dar %s este pe cale de a fi instalat"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "dar nu este instalabil"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "dar este un pachet virtual"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "dar nu este instalat"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "dar nu este pe cale să fie instalat"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " sau"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Următoarele pachete NOI vor fi instalate:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Următoarele pachete vor fi ȘTERSE:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Următoarele pachete au fost reținute:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Următoarele pachete vor fi ÎNNOITE:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Următoarele pachete vor fi DE-GRADATE:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Următoarele pachete ținute vor fi schimbate:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (datorită %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu înnoite, %lu nou instalate, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalate, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu de-gradate, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu de șters și %lu neînnoite.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu instalate sau șterse incomplet.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Eroare de compilare expresie regulată - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Corectez dependențele..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " eșec."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Nu s-au putut corecta dependențele"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Terminat"
-
-#: apt-private/private-cachefile.cc:102
-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."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependențe neîndeplinite. Încercați să folosiți -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Comanda de actualizare nu are argumente"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Calculez înnoirea... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Terminat"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Eșec la redenumirea lui %s în %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Atins "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Luat:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ignorat "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Eroare"
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Aduși: %sB în %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [În lucru]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1637,19 +1670,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nu s-a putut citi %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nu pot schimba la %s"
@@ -1678,11 +1711,11 @@ msgstr "Nu s-a putut deschide fișierul %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Eșec la crearea conexiunii IPC către subproces"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Conexiune închisă prematur"
 
@@ -1725,1369 +1758,489 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Se combină informațiile disponibile"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
-"\n"
-"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n"
-"de configurare și a șabloanelor dintr-un pachet Debian\n"
-"\n"
-"Opțiuni\n"
-"  -h   Acest text de ajutor.\n"
-"  -t   Impune directorul temporar\n"
-"  -c=? Citește acest fișier de configurare\n"
-"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nu s-a putut scrie în %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Lista de extensii pentru pachet este prea lungă"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Eroare la prelucrarea directorului %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Lista de extensii pentru sursă este prea lungă"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Eroare la scrierea antetului în fișierul index"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Eroare la prelucrarea conținutului %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Utilizare: apt-ftparchive [opțiuni] comanda\n"
-"Comenzi: packages cale_binare [fișier_înlocuire [prefix_cale]]\n"
-"          sources cale_src [fișier_înlocuire [prefix_cale]]\n"
-"          contents cale\n"
-"          release cale\n"
-"          generate config [grupuri]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generează fișiere de indexare pentru arhivele Debian. "
-"Suportă\n"
-"multe stiluri de generare de la complet automat la înlocuiri funcționale\n"
-"pentru dpkg-scanpackage și dpkg-scansources\n"
-"\n"
-"apt-ftparchive generează fișierele Package dintr-un arbore de .deb-uri.\n"
-"Fișierul Pachet înglobează conținutul tuturor câmpurilor de control din "
-"fiecare\n"
-"pachet cât și MD5 hash și dimensiunea fișierului. Un fișier de înlocuire "
-"este\n"
-"furnizat pentru a forța valoarea Priorității și Secțiunii.\n"
-"\n"
-"În mod asemănator apt-ftparchive generează fișierele Sources dintr-un arbore "
-"de .dsc-uri.\n"
-"Opțiunea --source-override poate fi folosită pentru a specifica fișierul de "
-"înlocuire\n"
-"\n"
-"Comenzile 'packages' și 'sources' ar trebui executate în rădăcina "
-"arborelui.\n"
-"Cale_binare ar trebui să indice baza căutării recursive și fișierul de "
-"înlocuire ar\n"
-"trebui să conțină semnalizatorul de înlocuire. Prefix_cale este adăugat "
-"câmpului\n"
-"de nume fișier dacă acesta este prezent. Exemplu de utilizare din arhiva\n"
-"Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opțiuni:\n"
-"  -h   Acest text de ajutor.\n"
-"  --md5 Generarea controlului MD5\n"
-"  -s=?  Fișierul de înlocuire pentru surse\n"
-"  -q    În liniște\n"
-"  -d=?  Selectează baza de date de cache opțională\n"
-"  --no-delink Activează modul de depanare dezlegare\n"
-"  --contents  Generarea fișierului cu sumarul de control\n"
-"  -c=? Citește acest fișier de configurare\n"
-"  -o=? Ajustează o opțiune de configurare arbitrară"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Nu s-a potrivit nici o selecție"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Unele fișiere lipsesc din grupul fișierului pachet '%s'"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB a fost corupt, fișierul a fost redenumit %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB este vechi, se încearcă înnoirea %s"
-
-#: ftparchive/cachedb.cc:76
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai "
-"veche, ștergeți și recreați baza de date."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nu s-a putut deschide fișierul DB %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Eșec la „stat” pentru %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Arhiva nu are înregistrare de control"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Nu s-a putut obține un cursor"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Nu s-a putut citi directorul %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: Nu s-a putut efectua „stat” pentru %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "A: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Erori la fișierul "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Eșec la „resolve” pentru %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Parcurgerea arborelui a eșuat"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Eșec la „open” pentru %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Dezlegare %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Eșec la „readlink” pentru %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Eșec la „unlink” pentru %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Eșec la „link” între %s și %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Arhiva nu are câmp de pachet"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nu are intrare de înlocuire\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s responsabil este %s nu %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nu are nici o intrare sursă de înlocuire\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nu are nici intrare binară de înlocuire\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Eșec la alocarea memoriei"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Nu s-a putut deschide %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Înlocuire greșită %s linia %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Înlocuire greșită %s linia %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Înlocuire greșită %s linia %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Înlocuire greșită %s linia %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritm de compresie necunoscut '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Eșec la crearea FIȘIERULUI*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Eșec la „fork”"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Comprimare copil"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Eroare internă, eșec la crearea lui %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "IE către subproces/fișier eșuat"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Eșec la citire în timpul calculului sumei MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problemă la desfacerea %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Eșec la redenumirea lui %s în %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
-"\n"
-"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n"
-"de configurare și a șabloanelor dintr-un pachet Debian\n"
-"\n"
-"Opțiuni\n"
-"  -h   Acest text de ajutor.\n"
-"  -t   Impune directorul temporar\n"
-"  -c=? Citește acest fișier de configurare\n"
-"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Înregistrare de pachet necunoscut!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Utilizare: apt-sortpkgs [opțiuni] fișier1 [fișier2 ...]\n"
-"\n"
-"apt-sortpkgs este o unealtă simplă pentru sortarea fișierelor pachete. \n"
-"Opțiunea -s este folosită pentru a indica ce fel de fișier este.\n"
-"\n"
-"Opțiuni:\n"
-"  -h   Acest text de ajutor\n"
-"  -s   Folosește sortarea de fișiere-sursă\n"
-"  -c=? Citește acest fișier de configurare\n"
-"  -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/"
-"tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Eșec la crearea conexiunilor"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Eșec la executarea lui gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Arhivă deteriorată"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr ""
-"Suma de control a arhivei tar nu s-a verificat, arhiva este deteriorată"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Tip antet TAR %u necunoscut, membrul %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Semnătură de arhivă necorespunzătoare"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Eroare la citirea antetului membrului arhivei"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Antet de membru de arhivă necorespunzător"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Antet de membru de arhivă necorespunzător"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arhiva este prea scurtă"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Eșec la citirea antetelor arhivei"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "S-a chemat DropNode pe un nod încă „legat”"
 
 # XXX: nu-mi place, fie e hash, fie „element de dispersie”
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Eșec la localizarea elementului de dispersie!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Eșec la alocarea redirectării"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Eroare internă în „AddDiversion”"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Încercare de suprascriere a redirectării, %s -> %s și %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Adăugare dublă de redirectare %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Fișier „conf” duplicat %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Eșec la scrierea fișierului %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Eșec la închiderea fișierului %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Calea %s este prea lungă"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Se despachetează %s de mai multe ori"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Directorul %s este redirectat"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Pachetul încearcă să scrie în ținta redirectării %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Calea de redirectare este prea lungă"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Eșec la „stat” pentru %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Eșec la redenumirea lui %s în %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Directorul %s este înlocuit de un non-director"
 
 # XXX: nu-mi place, hash bucket ar trebui tradus mai elegant
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Eșec la localizarea nodului în clasa lui din tabela de dispersie"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Calea este prea lungă"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Pachet suprascris fără nici o versiune pentru %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nu se poate executa „stat” pe %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Eșec la scrierea fișierului %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Eșec la închiderea fișierului %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Aceasta nu este o arhivă DEB validă, lipsește membrul „%s”"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Eroare internă, nu pot localiza membrul %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Fișier de control neanalizabil"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Nu s-a putut executa „mmap” cu un fișier gol"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Semnătură de arhivă necorespunzătoare"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Nu s-a putut deschide conexiunea pentru %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Eroare la citirea antetului membrului arhivei"
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Nu s-a putut face mmap cu %lu octeți"
+msgid "Invalid archive member header %s"
+msgstr "Antet de membru de arhivă necorespunzător"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Nu s-a putut deschide %s"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Antet de membru de arhivă necorespunzător"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Nu s-a putut invoca"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arhiva este prea scurtă"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Nu s-a putut face mmap cu %lu octeți"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Eșec la citirea antetelor arhivei"
 
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Eșec la trunchierea fișierului"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Eșec la crearea conexiunilor"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Eșec la executarea lui gzip "
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Arhivă deteriorată"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
 msgstr ""
+"Suma de control a arhivei tar nu s-a verificat, arhiva este deteriorată"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Tip antet TAR %u necunoscut, membrul %s"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "Nu pot determina starea %s."
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%limin %lis"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selecția %s nu a fost găsită"
-
-#: apt-pkg/contrib/configuration.cc:503
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Abreviere de tip nerecunoscut: „%c”"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Se deschide fișierul de configurare %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, 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:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Eroare de sintaxă %s:%u: etichetă greșită"
+msgid "Packaging system '%s' is not supported"
+msgstr "Sistemul de pachete '%s' nu este suportat"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Nu s-a putut determina un tip de sistem de împachetare potrivit"
 
-#: apt-pkg/contrib/configuration.cc:861
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, 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"
+msgid "Wrote %i records.\n"
+msgstr "S-au scris %i înregistrări.\n"
 
-#: apt-pkg/contrib/configuration.cc:868
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Eroare de sintaxă %s:%u: prea multe imbricări incluse"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Eroare de sintaxă %s:%u: incluse de aici"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, 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"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Eroare!"
+"S-au scris %i înregistrări cu %i fișiere lipsă și %i fișiere nepotrivite\n"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Terminat"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Terminat"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Opțiunea linie de comandă '%c' [din %s] este necunoscută."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Opțiunea linie de comandă %s nu este înțeleasă"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Opțiunea linie de comandă %s nu este booleană"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Opțiunea %s necesită un argument"
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-"Opțiunea %s: Specificația configurării articolului trebuie să aibă o =<val>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Opțiunea %s necesită un argument integru, nu '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Opțiunea '%s' este prea lungă"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Sensul %s nu este înțeles, încercați adevărat (true) sau fals (false)."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Operațiune invalidă %s"
+msgid "Hash mismatch for: %s"
+msgstr "Nepotrivire la suma de căutare"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Nu pot determina starea punctului de montare %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Eșec la „stat” pentru CD"
+msgid "The method driver %s could not be found."
+msgstr "Metoda driver %s nu poate fi găsită."
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problemă la închiderea fișierului"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Nu pot deschide fișierul blocat %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Nu pot determina blocajul %s"
+msgid "Is the package %s installed?"
+msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nu s-a lansat corect"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+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/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
+"Listele de pachete sau fișierul de stare n-au putut fi analizate sau "
+"deschise."
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:98
+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/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Subprocesul %s a primit o eroare de segmentare."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Subprocesul %s a primit o eroare de segmentare."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, 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:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Subprocesul %s s-a terminat brusc"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Nu s-a putut deschide fișierul %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Nu s-a putut deschide conexiunea pentru %s"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Eșec la crearea IPC-ului pentru subproces"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Eșec la executarea compresorului"
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu 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:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "scriere, încă mai am %lu de scris dar nu pot"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Problemă la închiderea fișierului"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problemă în timpul sincronizării fișierului"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problemă la dezlegarea fișierului"
-
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problemă în timpul sincronizării fișierului"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abandonez instalarea."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Lista surselor nu poate fi citită."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Cache gol de pachet"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Cache-ul fișierului pachet este deteriorat"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Fișierul cache al pachetului este o versiune incompatibilă"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Cache-ul fișierului pachet este deteriorat"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Acest APT nu suportă versioning system '%s'"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 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:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Depinde"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Pre-depinde"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Sugerează"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Recomandă"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Este în conflict"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Înlocuiește"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Învechit"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Corupe"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "cerut"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "opțional"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Se construiește arborele de dependență"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Versiuni candidat"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Generare dependențe"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Se citesc informațiile de stare"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Eșec la deschiderea fișierului de stare %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Eșec la scrierea fișierului temporar de stare %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Linie greșită %lu în lista sursă %s (dist)"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Linie greșită %lu în lista sursă %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Linie greșită %lu în lista sursă %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Deschidere %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linia %u prea lungă în lista sursă %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linie greșită %u în lista sursă %s (tip)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nu s-a putut deschide fișierul %s"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Aceasta instalare va avea nevoie de ștergerea temporară a pachetului "
-"esențial %s din cauza unui bucle conflict/pre-dependență. Asta de multe ori "
-"nu-i de bine, dar dacă vreți întradevăr s-o faceți, activați opțiunea APT::"
-"Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Tipul de fișier index '%s' nu este suportat"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
-"cauzată de pachete ținute."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Nu pot corecta problema, ați ținut pachete deteriorate."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Directorul de liste %spartial lipsește."
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Directorul de arhive %spartial lipsește."
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nu pot încuia directorul cu lista"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, 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:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Se descarcă fișierul %li din %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metoda driver %s nu poate fi găsită."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nu s-a lansat corect"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Sistemul de pachete '%s' nu este suportat"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Nu s-a putut determina un tip de sistem de împachetare potrivit"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nu pot determina starea %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Trebuie să puneți niște 'surse' de URI în sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Listele de pachete sau fișierul de stare n-au putut fi analizate sau "
-"deschise."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Lista surselor nu poate fi citită."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-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:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Nu s-a înțeles tipul de pin %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Fără prioritate (sau zero) specificată pentru pin"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Cache are un versioning system incompatibil"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Mamăăă, ați depășit numărul de nume de pachete de care este capabil acest "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Mamăăă, ați depășit numărul de versiuni de care este capabil acest APT."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Mamăăă, ați depășit numărul de descrieri de care este capabil acest APT."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Mamăăă, ați depășit numărul de dependențe de care este capabil acest APT."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Nu s-a găsit pachetul %s %s în timpul procesării dependențelor de fișiere"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nu pot determina starea listei surse de pachete %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Citire liste de pachete"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Colectare furnizori fișier"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nu s-a putut scrie în %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Eroare IO în timpul salvării sursei cache"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "redenumire eșuată, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Nepotrivire la suma de căutare"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Nepotrivire dimensiune"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operațiune invalidă %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Nu există nici o cheie publică disponibilă pentru următoarele "
 "identificatoare de chei:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3095,12 +2248,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3109,12 +2262,12 @@ msgstr ""
 "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
 "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3122,72 +2275,133 @@ msgstr ""
 "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
 "pachetul %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Blocul vânzător %s nu conține amprentă"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
+msgid "List directory %spartial is missing."
+msgstr "Directorul de liste %spartial lipsește."
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Notă, se selectează %s în locul lui %s\n"
+msgid "Archives directory %spartial is missing."
+msgstr "Directorul de arhive %spartial lipsește."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Nu pot încuia directorul cu lista"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Se descarcă fișierul %li din %li (%s rămas)"
+
+#: apt-pkg/acquire.cc:901
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Se descarcă fișierul %li din %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+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/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Trebuie să puneți niște 'surse' de URI în sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Linie necorespunzătoare în fișierul-redirectare: %s"
+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:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Nu s-a înțeles tipul de pin %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Fără prioritate (sau zero) specificată pentru pin"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
+msgid "Could not configure '%s'. "
+msgstr "Nu s-a putut deschide fișierul %s"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Blocul vânzător %s nu conține amprentă"
+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 ""
+"Aceasta instalare va avea nevoie de ștergerea temporară a pachetului "
+"esențial %s din cauza unui bucle conflict/pre-dependență. Asta de multe ori "
+"nu-i de bine, dar dacă vreți întradevăr s-o faceți, activați opțiunea APT::"
+"Force-LoopBreak."
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Linia %u prea lungă în lista sursă %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Se demontează CD-ul...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Utilizare punct de montare CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Demontare CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Aștept discul...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Montez CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "Identificare.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "Identificare... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etichetă memorată: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Se demontează CD-ul...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "Scanez discul de fișierele index..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "Scanez discul de fișierele index...\n"
 
 # DEVELOPERS: please consider using somehow plural forms
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3196,22 +2410,22 @@ 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:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "A fost găsită eticheta „%s”\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Acesta nu este un nume valid, mai încercați.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3220,303 +2434,1123 @@ msgstr ""
 "Acest disc este numit: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Copiez listele de pachete.."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Scriere noua listă sursă\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Intrările listei surselor pentru acest disc sunt:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "S-au scris %i înregistrări.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, 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/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
+"cauzată de pachete ținute."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Nu pot corecta problema, ați ținut pachete deteriorate."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Se construiește arborele de dependență"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiuni candidat"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generare dependențe"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Se citesc informațiile de stare"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n"
+msgid "Failed to open StateFile %s"
+msgstr "Eșec la deschiderea fișierului de stare %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"S-au scris %i înregistrări cu %i fișiere lipsă și %i fișiere nepotrivite\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Eșec la scrierea fișierului temporar de stare %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+msgid "Unable to parse package file %s (1)"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Nepotrivire la suma de căutare"
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' pentru '%s' n-a fost găsită"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nu s-a putut găsi sarcina %s"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Nu pot găsi pachetul %s"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Nu pot găsi pachetul %s"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Notă, se selectează %s în locul lui %s\n"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Linie necorespunzătoare în fișierul-redirectare: %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Linie greșită %lu în lista sursă %s (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
+
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Linie greșită %lu în lista sursă %s (URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Linie greșită %lu în lista sursă %s (dist)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-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/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Deschidere %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Linie greșită %u în lista sursă %s (tip)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Se instalează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Se configurează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Se șterge %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Șters complet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Se rulează declanșatorul post-instalare %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directorul „%s” lipsește."
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nu s-a putut deschide fișierul %s"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Se pregătește %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Se despachetează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Se pregătește configurarea %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Instalat %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Se pregătește ștergerea lui %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Șters %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Se pregătește ștergerea completă a %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Șters complet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Nu s-a putut scrie în %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nu pot încuia directorul cu lista"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selecția %s nu a fost găsită"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Nu pot deschide fișierul blocat %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Nu pot determina blocajul %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Subprocesul %s a primit o eroare de segmentare."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Subprocesul %s a primit o eroare de segmentare."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Subprocesul %s s-a terminat brusc"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problemă la închiderea fișierului"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Nu s-a putut deschide fișierul %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nu s-a putut deschide conexiunea pentru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Eșec la crearea IPC-ului pentru subproces"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Eșec la executarea compresorului"
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu 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:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "scriere, încă mai am %lu de scris dar nu pot"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problemă la închiderea fișierului"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problemă în timpul sincronizării fișierului"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problemă la dezlegarea fișierului"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problemă în timpul sincronizării fișierului"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Eroare!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Terminat"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Terminat"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Nu s-a putut executa „mmap” cu un fișier gol"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Nu s-a putut deschide conexiunea pentru %s"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Nu s-a putut face mmap cu %lu octeți"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Nu s-a putut deschide %s"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Nu s-a putut invoca"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nu s-a putut face mmap cu %lu octeți"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Eșec la trunchierea fișierului"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Nu pot determina starea punctului de montare %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Eșec la „stat” pentru CD"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Abreviere de tip nerecunoscut: „%c”"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Se deschide fișierul de configurare %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Eroare de sintaxă %s:%u: etichetă greșită"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Eroare de sintaxă %s:%u: incluse de aici"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, 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"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abandonez instalarea."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Opțiunea linie de comandă '%c' [din %s] este necunoscută."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Opțiunea linie de comandă %s nu este înțeleasă"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Opțiunea linie de comandă %s nu este booleană"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Opțiunea %s necesită un argument"
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"Opțiunea %s: Specificația configurării articolului trebuie să aibă o =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Opțiunea %s necesită un argument integru, nu '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opțiunea '%s' este prea lungă"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Sensul %s nu este înțeles, încercați adevărat (true) sau fals (false)."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Operațiune invalidă %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
+"\n"
+"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n"
+"de configurare și a șabloanelor dintr-un pachet Debian\n"
+"\n"
+"Opțiuni\n"
+"  -h   Acest text de ajutor.\n"
+"  -t   Impune directorul temporar\n"
+"  -c=? Citește acest fișier de configurare\n"
+"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nu se poate executa „stat” pe %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Lista de extensii pentru pachet este prea lungă"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Eroare la prelucrarea directorului %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Lista de extensii pentru sursă este prea lungă"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Eroare la scrierea antetului în fișierul index"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Eroare la prelucrarea conținutului %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Utilizare: apt-ftparchive [opțiuni] comanda\n"
+"Comenzi: packages cale_binare [fișier_înlocuire [prefix_cale]]\n"
+"          sources cale_src [fișier_înlocuire [prefix_cale]]\n"
+"          contents cale\n"
+"          release cale\n"
+"          generate config [grupuri]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generează fișiere de indexare pentru arhivele Debian. "
+"Suportă\n"
+"multe stiluri de generare de la complet automat la înlocuiri funcționale\n"
+"pentru dpkg-scanpackage și dpkg-scansources\n"
+"\n"
+"apt-ftparchive generează fișierele Package dintr-un arbore de .deb-uri.\n"
+"Fișierul Pachet înglobează conținutul tuturor câmpurilor de control din "
+"fiecare\n"
+"pachet cât și MD5 hash și dimensiunea fișierului. Un fișier de înlocuire "
+"este\n"
+"furnizat pentru a forța valoarea Priorității și Secțiunii.\n"
+"\n"
+"În mod asemănator apt-ftparchive generează fișierele Sources dintr-un arbore "
+"de .dsc-uri.\n"
+"Opțiunea --source-override poate fi folosită pentru a specifica fișierul de "
+"înlocuire\n"
+"\n"
+"Comenzile 'packages' și 'sources' ar trebui executate în rădăcina "
+"arborelui.\n"
+"Cale_binare ar trebui să indice baza căutării recursive și fișierul de "
+"înlocuire ar\n"
+"trebui să conțină semnalizatorul de înlocuire. Prefix_cale este adăugat "
+"câmpului\n"
+"de nume fișier dacă acesta este prezent. Exemplu de utilizare din arhiva\n"
+"Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opțiuni:\n"
+"  -h   Acest text de ajutor.\n"
+"  --md5 Generarea controlului MD5\n"
+"  -s=?  Fișierul de înlocuire pentru surse\n"
+"  -q    În liniște\n"
+"  -d=?  Selectează baza de date de cache opțională\n"
+"  --no-delink Activează modul de depanare dezlegare\n"
+"  --contents  Generarea fișierului cu sumarul de control\n"
+"  -c=? Citește acest fișier de configurare\n"
+"  -o=? Ajustează o opțiune de configurare arbitrară"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Nu s-a potrivit nici o selecție"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Unele fișiere lipsesc din grupul fișierului pachet '%s'"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB a fost corupt, fișierul a fost redenumit %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB este vechi, se încearcă înnoirea %s"
+
+#: ftparchive/cachedb.cc:80
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai "
+"veche, ștergeți și recreați baza de date."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nu s-a putut deschide fișierul DB %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Arhiva nu are înregistrare de control"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Nu s-a putut obține un cursor"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Nu s-a putut citi directorul %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "A: Nu s-a putut efectua „stat” pentru %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "A: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Erori la fișierul "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Eșec la „resolve” pentru %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Parcurgerea arborelui a eșuat"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Eșec la „open” pentru %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " Dezlegare %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Eșec la „readlink” pentru %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Eșec la „unlink” pentru %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Eșec la „link” între %s și %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Arhiva nu are câmp de pachet"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s nu are intrare de înlocuire\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s responsabil este %s nu %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s nu are nici o intrare sursă de înlocuire\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s nu are nici intrare binară de înlocuire\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Eșec la alocarea memoriei"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nu s-a putut deschide %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Înlocuire greșită %s linia %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Înlocuire greșită %s linia %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Înlocuire greșită %s linia %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Înlocuire greșită %s linia %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritm de compresie necunoscut '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Eșec la crearea FIȘIERULUI*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Eșec la „fork”"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Comprimare copil"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Eroare internă, eșec la crearea lui %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IE către subproces/fișier eșuat"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Eșec la citire în timpul calculului sumei MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problemă la desfacerea %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
+"\n"
+"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n"
+"de configurare și a șabloanelor dintr-un pachet Debian\n"
+"\n"
+"Opțiuni\n"
+"  -h   Acest text de ajutor.\n"
+"  -t   Impune directorul temporar\n"
+"  -c=? Citește acest fișier de configurare\n"
+"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Înregistrare de pachet necunoscut!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Utilizare: apt-sortpkgs [opțiuni] fișier1 [fișier2 ...]\n"
+"\n"
+"apt-sortpkgs este o unealtă simplă pentru sortarea fișierelor pachete. \n"
+"Opțiunea -s este folosită pentru a indica ce fel de fișier este.\n"
+"\n"
+"Opțiuni:\n"
+"  -h   Acest text de ajutor\n"
+"  -s   Folosește sortarea de fișiere-sursă\n"
+"  -c=? Citește acest fișier de configurare\n"
+"  -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/"
+"tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s nu este un pachet DEB valid."
 
diff --git a/po/ru.po b/po/ru.po
index e0654f524..882c776cf 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt rev2227.1.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2012-06-30 08:47+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -26,152 +26,153 @@ 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:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Пакет %s версии %s имеет неудовлетворённую зависимость:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Всего имён пакетов: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Всего структур пакетов: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Обычных пакетов: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Полностью виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Одиночных виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Смешанных виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Отсутствует: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Всего уникальных версий: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Всего уникальных описаний: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Всего зависимостей: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Всего отношений Версия/Файл: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Всего отношений Описание/Файл: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Всего отношений Provides: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Всего развёрнутых строк: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Всего информации о зависимостях: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Пустого места в кэше: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Полное учтённое пространство: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Список пакетов %s рассинхронизирован."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Не найдено ни одного пакета"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Вы должны задать не менее одно шаблона поиска"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Эта команда устарела. Используйте вместо неё «apt-mark showauto»."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Не удалось найти пакет %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Списки пакетов:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Кэш рассинхронизирован, невозможно обнаружить ссылку на список пакетов"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Зафиксированные пакеты:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(не найдено)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Установлен: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(отсутствует)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Фиксатор пакета: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Таблица версий:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s для %s скомпилирован %s %s\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -241,28 +242,28 @@ msgstr ""
 "  -o=? Задать значение произвольной настройки, например, -o dir::cache=/tmp\n"
 "Подробности в справочных страницах apt-cache(8) и apt.conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Задайте имя для этого диска, например «Debian 5.0.3 Disk 1»"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Вставьте диск в устройство и нажмите ввод"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Не удалось примонтировать «%s» к «%s»"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Повторите этот процесс для всех имеющихся CD."
 
@@ -299,47 +300,47 @@ msgstr ""
 "   -o=? Задать значение произвольной настройке, например, -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Не удалось найти пакет по регулярному выражению «%s»"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Не удалось найти пакет по регулярному выражению «%s»"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Не удалось найти пакет по регулярному выражению «%s»"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Используется «%s» в качестве исходного пакета вместо «%s»\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Игнорируется недоступная версия «%s» пакета «%s»"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не удалось найти пакет %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s установлен вручную.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s выбран для автоматической установки.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -347,20 +348,20 @@ msgstr ""
 "Эта команда устарела. Используйте вместо неё «apt-mark auto» и «apt-mark "
 "manual»."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутренняя ошибка, решатель проблем всё поломал"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Укажите как минимум один пакет, исходный код которого необходимо получить"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Невозможно найти пакет с исходным кодом для %s"
@@ -385,80 +386,80 @@ msgstr ""
 "bzr branch %s\n"
 "для получения последних (возможно не выпущенных) обновлений пакета.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаем уже скачанный файл «%s»\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не удалось определить количество свободного места в %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Недостаточно места в %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Необходимо получить %sб архивов исходного кода.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Получение исходного кода %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Некоторые архивы не удалось получить."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Указан режим «только скачивание», и скачивание завершено"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда распаковки «%s» завершилась неудачно.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда сборки «%s» завершилась неудачно.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Порождённый процесс завершился неудачно"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для проверки зависимостей для сборки необходимо указать как минимум один "
 "пакет"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -467,17 +468,17 @@ msgstr ""
 "У %s отсутствует информация об архитектуре. Для её настройки смотрите apt."
 "conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Невозможно получить информацию о зависимостях для сборки %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не имеет зависимостей для сборки.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -486,7 +487,7 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как %s не "
 "разрешён для пакетов «%s»"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -495,14 +496,14 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
 "найден"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
 "пакет %s новее, чем надо"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -511,7 +512,7 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как версия-"
 "кандидат пакета %s не может удовлетворить требованиям по версии"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -520,30 +521,30 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
 "имеет версии-кандидата"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимости для сборки %s не могут быть удовлетворены."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Обработка зависимостей для сборки завершилась неудачно"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog для %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Поддерживаемые модули:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -635,54 +636,76 @@ msgstr ""
 "содержится подробная информация и описание параметров.\n"
 "                       В APT есть коровья СУПЕРСИЛА.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+"Укажите как минимум один пакет, исходный код которого необходимо получить"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s не может быть помечен, так он не установлен.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s уже помечен как установленный вручную.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s уже помечен как установленный автоматически.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s уже помечен как зафиксированный.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s уже помечен как не зафиксированный.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ожидалось завершение процесса %s, но он не был запущен"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s помечен как зафиксированный.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Отмена фиксации для %s.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 "Выполнение dpkg завершилось с ошибкой. У вас есть права суперпользователя?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -731,7 +754,7 @@ msgstr ""
 "В справочных страницах apt-mark(8) и apt.conf(5)\n"
 "содержится подробная информация и описание параметров."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -779,52 +802,52 @@ msgstr "Невозможно размонтировать CD-ROM в %s, возм
 msgid "Disk not found."
 msgstr "Диск не найден."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Файл не найден"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Не удалось получить атрибуты"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Не удалось установить время модификации"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Неправильный URI, локальный URI не должен начинаться с //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Вход в систему"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Невозможно определить имя удалённого сервера"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Невозможно определить локальное имя"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Сервер разорвал соединение и сообщил: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Команда USER не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Команда PASS не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -832,125 +855,127 @@ msgstr ""
 "Proxy-сервер указан, однако нет сценария входа в систему, Acquire::ftp::"
 "ProxyLogin пуст."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Команда «%s» сценария входа в систему завершилась неудачно, сервер сообщил: "
 "%s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Команда TYPE не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Допустимое время ожидания для соединения истекло"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Сервер прервал соединение"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Ошибка чтения"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Ответ переполнил буфер."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Искажение протокола"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Ошибка записи"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Не удалось создать сокет"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Не удалось присоединиться к сокету данных, время на установление соединения "
 "истекло"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Неудачно"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Невозможно присоединить пассивный сокет"
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Вызов getaddrinfo не смог получить сокет"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Невозможно присоединиться к сокету"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Не удалось принимать соединения на сокете"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Не удалось определить имя сокета"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Невозможно послать команду PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Неизвестное семейство адресов %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Команда EPRT не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Время установления соединения для сокета данных истекло"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Невозможно принять соединение"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Проблема при хешировании файла"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Невозможно получить файл, сервер сообщил: «%s»"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Время ожидания соединения для сокета данных истекло"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Передача данных завершилась неудачно, сервер сообщил: «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Запрос"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Невозможно вызвать "
 
@@ -986,7 +1011,7 @@ msgstr "Не удаётся соединиться с %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Соединение с %s"
@@ -1016,38 +1041,38 @@ msgstr "Что-то странное произошло при определе�
 msgid "Unable to connect to %s:%s:"
 msgstr "Невозможно соединиться с %s: %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
 "ключа?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Найдена как минимум одна неправильная подпись."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Не удалось выполнить «gpgv» для проверки подписи (gpgv установлена?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Неизвестная ошибка при выполнении gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Следующие подписи неверные:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1055,117 +1080,356 @@ msgstr ""
 "Следующие подписи не могут быть проверены, так как недоступен открытый "
 "ключ:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Пустые файлы не могут быть допустимыми архивами"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Ошибка чтения, удалённый сервер прервал соединение"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Ошибка чтения с сервера"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Ошибка в select"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Время ожидания для соединения истекло"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Ошибка записи в выходной файл"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Ожидание заголовков"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Неверный заголовок"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-сервер послал неверный заголовок"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http сервер послал неверный заголовок Content-Length"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-сервер послал неверный заголовок Content-Range"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Этот HTTP-сервер не поддерживает скачивание фрагментов файлов"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Неизвестный формат данных"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Неверный заголовок данных"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Соединение разорвано"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Расчёт обновлений…"
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Готово"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Исправление зависимостей…"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " не удалось."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Невозможно скорректировать зависимости"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Невозможно минимизировать набор обновлений"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Готово"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
+"f install»."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Установлен]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Установлен]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Установлен]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Установлен]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "но %s уже установлен"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "но %s будет установлен"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "но он не может быть установлен"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "но это виртуальный пакет"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "но он не установлен"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "но он не будет установлен"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " или"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "НОВЫЕ пакеты, которые будут установлены:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Пакеты, которые будут УДАЛЕНЫ:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Пакеты, которые будут оставлены в неизменном виде:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Пакеты, которые будут обновлены:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr ""
+"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (вследствие %s) "
+
+#: apt-private/private-output.cc:662
+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"
+"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "обновлено %lu, установлено %lu новых пакетов, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "переустановлено %lu переустановлено, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu пакетов заменены на старые версии, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "не установлено до конца или удалено %lu пакетов.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[Д/н]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "д"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "н"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Ошибка компиляции регулярного выражения — %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Команде update не нужны аргументы"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Внутренняя ошибка, InstallPackages была вызвана с неработоспособными "
 "пакетами!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Пакеты необходимо удалить, но удаление запрещено."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутренняя ошибка, Ordering не завершилась"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr "Странно. Несовпадение размеров, напишите на apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Необходимо скачать %sB/%sB архивов.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Необходимо скачать %sБ архивов.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1174,23 +1438,23 @@ msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 "После данной операции, объём занятого дискового пространства уменьшится на "
 "%sB.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Недостаточно свободного места в %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Существуют проблемы, а параметр -y указан без --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Запрошено выполнение только тривиальных операций, но это не тривиальная "
@@ -1198,11 +1462,11 @@ msgstr ""
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Да, делать, как я скажу!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1213,19 +1477,19 @@ msgstr ""
 "Чтобы продолжить, введите фразу: «%s»\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Аварийное завершение."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Хотите продолжить?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Некоторые файлы скачать не удалось"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1233,19 +1497,19 @@ msgstr ""
 "Невозможно получить некоторые архивы, вероятно надо запустить apt-get update "
 "или попытаться повторить запуск с ключом --fix-missing"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing и смена носителя в данный момент не поддерживаются"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Невозможно исправить ситуацию с пропущенными пакетами."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Аварийное завершение установки."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1262,15 +1526,15 @@ msgstr[2] ""
 "Следующие пакеты исчез из системы, так как все их файлы\n"
 "теперь берутся из других пакетов:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Замечание: это сделано автоматически и специально программой dpkg."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1288,15 +1552,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Следующая информация, возможно, поможет вам:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутренняя ошибка, AutoRemover всё поломал"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1308,7 +1572,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Следующие пакеты устанавливались автоматически и больше не требуются:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1317,20 +1581,20 @@ msgstr[0] "%lu пакет был установлен автоматически
 msgstr[1] "%lu пакета было установлено автоматически и больше не требуется.\n"
 msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Для его удаления используйте «apt-get autoremove»."
 msgstr[1] "Для их удаления используйте «apt-get autoremove»."
 msgstr[2] "Для их удаления используйте «apt-get autoremove»."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
 "f install»:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1338,7 +1602,7 @@ msgstr ""
 "Неудовлетворённые зависимости. Попытайтесь выполнить «apt-get -f install», "
 "не указывая имени пакета, (или найдите другое решение)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1349,326 +1613,96 @@ msgstr ""
 "или же используете нестабильную версию дистрибутива, где запрошенные вами\n"
 "пакеты ещё не созданы или были удалены из Incoming."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Сломанные пакеты"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Будут установлены следующие дополнительные пакеты:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Предлагаемые пакеты:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Рекомендуемые пакеты:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"ЗАМЕЧАНИЕ: Производить только имитация работы!\n"
+"      Для реальной работы apt-get требуются права суперпользователя.\n"
+"      Учтите, что блокировка не используется,\n"
+"      поэтому нет полного соответствия с текущей реальной ситуацией!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Предупреждение об аутентификации не принято в внимание.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Некоторые пакеты невозможно аутентифицировать"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Установить эти пакеты без проверки?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Не удалось получить %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Установлен]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Установлен]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Установлен]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Установлен]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "но %s уже установлен"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "но %s будет установлен"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "но он не может быть установлен"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "но это виртуальный пакет"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "но он не установлен"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "но он не будет установлен"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " или"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "НОВЫЕ пакеты, которые будут установлены:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Пакеты, которые будут УДАЛЕНЫ:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Пакеты, которые будут оставлены в неизменном виде:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Пакеты, которые будут обновлены:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr ""
-"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (вследствие %s) "
-
-#: apt-private/private-output.cc:631
-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"
-"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "обновлено %lu, установлено %lu новых пакетов, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "переустановлено %lu переустановлено, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu пакетов заменены на старые версии, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "не установлено до конца или удалено %lu пакетов.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[Д/н]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "д"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "н"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Ошибка компиляции регулярного выражения — %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Исправление зависимостей…"
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " не удалось."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Невозможно скорректировать зависимости"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Невозможно минимизировать набор обновлений"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
-"f install»."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Команде update не нужны аргументы"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Расчёт обновлений…"
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Готово"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"ЗАМЕЧАНИЕ: Производить только имитация работы!\n"
-"      Для реальной работы apt-get требуются права суперпользователя.\n"
-"      Учтите, что блокировка не используется,\n"
-"      поэтому нет полного соответствия с текущей реальной ситуацией!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Не удалось переименовать %s в %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "В кэше "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Получено:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Игн "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Ош  "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Получено %sБ за %s (%sБ/c)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Обработка]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1681,19 +1715,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Невозможно прочитать %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Невозможно сменить текущий каталог на %s"
@@ -1722,11 +1756,11 @@ msgstr "Невозможно прочитать файл на зеркале «%
 msgid "[Mirror: %s]"
 msgstr "[Зеркало: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Не удалось создать IPC-канал для порождённого процесса"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Соединение закрыто преждевременно"
 
@@ -1768,1349 +1802,452 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Слияние доступной информации"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Использование: apt-extracttemplates файл1 [файл2…]\n"
-"\n"
-"apt-extracttemplates извлекает из пакетов Debian данные config и template\n"
-"\n"
-"Параметры:\n"
-"  -h   Этот текст\n"
-"  -t   Задать каталог для временных файлов\n"
-"  -c=? Читать указанный файл настройки\n"
-"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Невозможно записать в %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Невозможно определить версию debconf. Он установлен?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Список расширений, допустимых для пакетов, слишком длинен"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Ошибка обработки каталога %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Список расширений источников слишком длинен"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr ""
-"Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Использование: apt-ftparchive [параметры] команда\n"
-"Команды:  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 генерирует индексные файлы архивов Debian. Он поддерживает\n"
-"множество стилей генерации: от полностью автоматического до функциональной "
-"замены\n"
-"программ dpkg-scanpackages и dpkg-scansources\n"
-"\n"
-"apt-ftparchive генерирует файлы Package (списки пакетов) для дерева\n"
-"каталогов, содержащих файлы .deb. Файл Package включает в себя управляющие\n"
-"поля каждого пакета, а также хеш MD5 и размер файла. Значения управляющих\n"
-"полей «приоритет» (Priority) и «секция» (Section) могут быть изменены с\n"
-"помощью файла override.\n"
-"\n"
-"Кроме того, apt-ftparchive может генерировать файлы Sources из дерева\n"
-"каталогов, содержащих файлы .dsc. Для указания файла override в этом \n"
-"режиме можно использовать параметр --source-override.\n"
-"\n"
-"Команды «packages» и «sources» надо выполнять, находясь в корневом каталоге\n"
-"дерева, которое вы хотите обработать. BinaryPath должен указывать на место,\n"
-"с которого начинается рекурсивный обход, а файл переназначений (override)\n"
-"должен содержать записи о переназначениях управляющих полей. Если был "
-"указан\n"
-"Pathprefix, то его значение добавляется к управляющим полям, содержащим\n"
-"имена файлов. Пример использования для архива Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Параметры:\n"
-"  -h    Этот текст\n"
-"  --md5 Управление генерацией MD5-хешей\n"
-"  -s=?  Указать файл переназначений (override) для источников\n"
-"  -q    Не выводить сообщения в процессе работы\n"
-"  -d=?  Указать кэширующую базу данных (не обязательно)\n"
-"  --no-delink Включить режим отладки процесса удаления файлов\n"
-"  --contents  Управление генерацией полного перечня содержимого пакетов\n"
-"              (файла Contents)\n"
-"  -c=?  Использовать указанный файл настройки\n"
-"  -o=?  Задать значение произвольному параметру настройки"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Совпадений не обнаружено"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "В группе пакетов «%s» отсутствуют некоторые файлы"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "БД была повреждена, файл переименован в %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB устарела, попытка обновить %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите "
-"и создайте базу данных заново."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Не удалось открыть DB файл %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Не удалось получить атрибуты %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "В архиве нет поля control"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Невозможно получить курсор"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Не удалось прочитать каталог %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Не удалось прочитать атрибуты %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Ошибки относятся к файлу "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Не удалось проследовать по ссылке %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Не удалось совершить обход дерева"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Не удалось открыть %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Не удалось прочесть ссылку %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Не удалось удалить %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Не удалось создать ссылку %s на %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Превышен лимит в %sB в DeLink.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "В архиве нет поля package"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Нет записи о переназначении (override) для %s\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  пакет %s сопровождает %s, а не %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  Нет записи source override для %s\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  Нет записи binary override для %s\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc — не удалось выделить память"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Не удалось открыть %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Не удалось прочесть файл переназначений (override) %s"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Неправильная запись о переназначении (override) %s в строке %llu #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Неправильная запись о переназначении (override) %s в строке %llu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Неизвестный алгоритм сжатия «%s»"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr ""
-"Для получения сжатого вывода %s необходимо включить использования сжатия"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Не удалось создать FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Не удалось запустить порождённый процесс"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Процесс-потомок, производящий сжатие"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Внутренняя ошибка, не удалось создать %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Ошибка ввода/вывода в подпроцесс/файл"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Ошибка чтения во время вычисления MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Не удалось удалить %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Не удалось переименовать %s в %s"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Использование: apt-internal-solver\n"
-"\n"
-"apt-internal-solver — интерфейс к внутреннему решателю, предназначен\n"
-"для отладки, подобен интерфейсу внешнего решателя семейства APT\n"
-"\n"
-"Параметры:\n"
-"  -h   Этот текст\n"
-"  -q   Вывод протокола работы — индикатор выполнения отключён\n"
-"  -c=? Читать указанный файл настройки\n"
-"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Запись о неизвестном пакете!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Использование: apt-sortpkgs [параметры] файл1 [файл2…]\n"
-"\n"
-"apt-sortpkgs — простой инструмент для сортировки списков пакетов. Параметр -"
-"s\n"
-"используется для указания типа списка.\n"
-"\n"
-"Параметры:\n"
-"  -h   этот текст\n"
-"  -s   сортировать список файлов пакетов исходного кода\n"
-"  -c=? читать указанный файл настройки\n"
-"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Не удалось создать каналы"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Не удалось выполнить gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Повреждённый архив"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Неправильная контрольная сумма Tar, архив повреждён"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Неверная сигнатура архива"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Ошибка чтения заголовка элемента архива"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Неправильный заголовок элемента архива %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Неправильный заголовок элемента архива"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Слишком короткий архив"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Не удалось прочитать заголовки архива"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode вызван для узла, который ещё используется"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Не удалось найти элемент хеша!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Не удалось создать diversion"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Внутренняя ошибка в AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Попытка изменения diversion, %s -> %s и %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Двойное добавление diversion %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Повторно указан файл настройки %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Не удалось записать в файл %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Не удалось закрыть файл %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Слишком длинный путь %s"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Повторная распаковка %s"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Каталог %s входит в список diverted"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Пакет пытается писать в diversion %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Путь diversion слишком длинен"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Не удалось получить атрибуты %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Не удалось переименовать %s в %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Каталог %s был заменён не-каталогом"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Не удалось разместить узел в хеше"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Путь слишком длинен"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Файлы заменяются содержимым пакета %s без версии"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Файл %s/%s переписывает файл в пакете %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Невозможно получить атрибуты %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Не удалось записать в файл %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Не удалось закрыть файл %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Это неправильный DEB-архив — отсутствует составная часть «%s»"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Внутренняя ошибка, не удалось найти составную часть %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Не удалось прочесть содержимое control-файла"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Невозможно отобразить в память пустой файл"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Не удалось сделать копию файлового дескриптора %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Невозможно отобразить в память %llu байт"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Не удалось закрыть mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Не удалось синхронизировать mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Невозможно отобразить в память %lu байт"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Не удалось обрезать файл"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Start. "
-"Текущее значение: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Не удалось увеличить размер MMap, так как уже достигнут предел в %lu байт."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Не удалось увеличить размер MMap, так как автоматическое увеличение "
-"отключено пользователем."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liч %liмин %liс"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%liмин %liс"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%liс"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Не найдено: %s"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Неизвестная аббревиатура типа: «%c»"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Открытие файла настройки %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени."
-
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Синтаксическая ошибка %s:%u: искажённый тег"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения"
-
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-"Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем "
-"уровне"
-
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include"
-
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места"
-
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива «%s»"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Синтаксическая ошибка %s:%u: для директивы clear требуется третий параметр в "
-"качестве аргумента"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s… Ошибка!"
-
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s… Готово"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr "…"
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s… %u%%"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Неверная сигнатура архива"
 
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Неизвестный параметр командной строки «%c» [из %s]."
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Ошибка чтения заголовка элемента архива"
 
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Command line option %s is not understood"
-msgstr "Не распознанный параметр командной строки %s"
+msgid "Invalid archive member header %s"
+msgstr "Неправильный заголовок элемента архива %s"
 
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Параметр командной строки %s — не логический переключатель \"да/нет\""
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Неправильный заголовок элемента архива"
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Для параметра %s требуется аргумент."
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Слишком короткий архив"
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Значение параметра %s должно иметь вид =<val>."
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Не удалось прочитать заголовки архива"
 
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Для параметра %s требуется аргумент в виде целого числа, а не «%s»"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Не удалось создать каналы"
 
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Параметр «%s» слишком длинный"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Не удалось выполнить gzip "
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Смысл %s не ясен, используйте true или false."
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Повреждённый архив"
 
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Неверная операция %s"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Неправильная контрольная сумма Tar, архив повреждён"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Невозможно прочитать атрибуты точки монтирования %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Невозможно получить атрибуты cdrom"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s"
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Проблема закрытия gzip-файла %s"
+msgid "Unable to stat %s."
+msgstr "Невозможно получить атрибуты %s."
 
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Not using locking for read only lock file %s"
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Блокировка не используется, так как файл блокировки %s доступен только для "
-"чтения"
 
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Не удалось открыть файл блокировки %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Блокировка не используется, так как файл блокировки %s находится на файловой "
-"системе nfs"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Запускается dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Could not get lock %s"
-msgstr "Не удалось получить доступ к файлу блокировки %s"
+msgid "Packaging system '%s' is not supported"
+msgstr "Система пакетирования «%s» не поддерживается"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Список файлов не может быть создан, так как «%s» не является каталогом"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Невозможно определить подходящий тип системы пакетирования"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Файл «%s» в каталоге «%s» игнорируется, так как это необычный файл"
+msgid "Wrote %i records.\n"
+msgstr "Сохранено %i записей.\n"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет расширения"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Сохранено %i записей с %i отсутствующими файлами.\n"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
-"Файл «%s» в каталоге «%s» игнорируется, так как он не имеет неправильное "
-"расширение"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Сохранено %i записей с %i несовпадающими файлами\n"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Порождённый процесс %s получил сигнал %u."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Порождённый процесс %s вернул код ошибки (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Порождённый процесс %s неожиданно завершился"
+"Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими "
+"файлами\n"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open file %s"
-msgstr "Не удалось открыть файл %s"
+msgid "Can't find authentication record for: %s"
+msgstr "Не удалось найти аутентификационную запись для: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Не удалось открыть файловый дескриптор %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Не удалось создать IPC с порождённым процессом"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Не удалось выполнить компрессор "
+msgid "Hash mismatch for: %s"
+msgstr "Не совпадает хеш сумма для: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "read, still have %llu to read but none left"
-msgstr ""
-"ошибка при чтении; собирались прочесть ещё %llu байт, но ничего больше нет"
+msgid "The method driver %s could not be found."
+msgstr "Драйвер для метода %s не найден."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "Проблема закрытия файла %s"
+msgid "Method %s did not start correctly"
+msgstr "Метод %s запустился не корректно"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Проблема при переименовании файла %s в %s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод."
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Проблема при удалении файла %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Списки пакетов или файл состояния не могут быть открыты или прочитаны."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Проблема при синхронизации файла"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Вы можете запустить «apt-get update» для исправления этих ошибок"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Связка ключей в %s не установлена."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Не читается перечень источников."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Кэш пакетов пуст"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Кэш пакетов повреждён"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Не поддерживаемая версия кэша пакетов"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Кэш пакетов повреждён, он слишком мал"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Эта версия APT не поддерживает систему версий «%s»"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Кэш пакетов был собран для другой архитектуры"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Зависит"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "ПредЗависит"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Предлагает"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Рекомендует"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Конфликтует"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Заменяет"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Замещает"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Ломает"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Улучшает"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "важный"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "необходимый"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "стандартный"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "необязательный"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "дополнительный"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Построение дерева зависимостей"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Версии-кандидаты"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Генерирование зависимостей"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Чтение информации о состоянии"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не удалось открыть StateFile %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не удалось записать временный StateFile %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Невозможно разобрать содержимое пакета %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Невозможно разобрать содержимое пакета %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет "
-"значения)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Искажённая строка %lu в списке источников %s (absolute dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Открытие %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Строка %u в списке источников %s слишком длинна."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Искажённая строка %u в списке источников %s (тип)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 "
-"apt.conf о APT::Immediate-Configure. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Не удалось настроить «%s»."
-
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"Вследствие возникновения циклических зависимостей типа Конфликтует/"
-"ПредЗависит, для продолжения установки необходимо временно удалить "
-"существенно важный пакет %s. Это может привести к фатальным последствиям. "
-"Если вы действительно хотите продолжить, установите параметр APT::Force-"
-"LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Не поддерживается индексный файл типа «%s»"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Пакет %s нуждается в переустановке, но найти архив для него не удалось."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это "
-"может быть вызвано отложенными (held) пакетами."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Каталог списка %spartial отсутствует."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Архивный каталог %spartial отсутствует."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Невозможно заблокировать каталог %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Скачивается файл %li из %li (осталось %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Скачивается файл %li из %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер для метода %s не найден."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s запустился не корректно"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод."
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Система пакетирования «%s» не поддерживается"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Невозможно определить подходящий тип системы пакетирования"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Невозможно получить атрибуты %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Списки пакетов или файл состояния не могут быть открыты или прочитаны."
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Вы можете запустить «apt-get update» для исправления этих ошибок"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Не читается перечень источников."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"Значение «%s» недопустимо для APT::Default-Release, так как выпуск "
-"недоступен в источниках"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Неверная запись в файле параметров %s: отсутствует заголовок Package"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Неизвестный тип фиксации %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Для фиксации не указан приоритет (или указан нулевой)"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Кэш имеет несовместимую систему версий"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Произошла ошибка во время обработки %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Превышено допустимое количество имён пакетов, которое способен обработать "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Превышено допустимое количество версий, которое способен обработать APT."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Превышено допустимое количество описаний, которое способен обработать APT."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Превышено допустимое количество зависимостей, которое способен обработать "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Во время обработки файла зависимостей не найден пакет %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Чтение списков пакетов"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Сбор информации о Provides"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Невозможно записать в %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Отправка сценария решателю"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Отправка запроса решателю"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Подготовка к приёму решения"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Запустить внешний решатель"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "переименовать не удалось, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Хеш сумма не совпадает"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Не совпадает размер"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Неверная операция %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3119,16 +2256,16 @@ msgstr ""
 "Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись "
 "в sources.list или файл)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Невозможно найти хеш-сумму «%s» в файле Release"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3137,12 +2274,12 @@ msgstr ""
 "Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого "
 "репозитория производиться не будет."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3152,12 +2289,12 @@ msgstr ""
 "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Ошибка GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3166,82 +2303,147 @@ msgstr ""
 "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
 "вручную исправить этот пакет (возможно, пропущен arch)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Невозможно разобрать содержимое файла Release (%s)"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Отсутствуют разделы в файле Release (%s)"
+msgid "List directory %spartial is missing."
+msgstr "Каталог списка %spartial отсутствует."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Отсутствуют элементы Hash в файле Release (%s)"
+msgid "Archives directory %spartial is missing."
+msgstr "Архивный каталог %spartial отсутствует."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
+msgid "Unable to lock directory %s"
+msgstr "Невозможно заблокировать каталог %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Неправильный элемент «Date» в файле Release %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Скачивается файл %li из %li (осталось %s)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)"
+msgid "Retrieving file %li of %li"
+msgstr "Скачивается файл %li из %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Некоторые индексные файлы не скачались. Они были проигнорированы или вместо "
+"них были использованы старые версии."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"Значение «%s» недопустимо для APT::Default-Release, так как выпуск "
+"недоступен в источниках"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Неверная запись в файле параметров %s: отсутствует заголовок Package"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Неизвестный тип фиксации %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Для фиксации не указан приоритет (или указан нулевой)"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 "
+"apt.conf о APT::Immediate-Configure. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Не удалось настроить «%s»."
+
+#: apt-pkg/packagemanager.cc:577
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Вследствие возникновения циклических зависимостей типа Конфликтует/"
+"ПредЗависит, для продолжения установки необходимо временно удалить "
+"существенно важный пакет %s. Это может привести к фатальным последствиям. "
+"Если вы действительно хотите продолжить, установите параметр APT::Force-"
+"LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Строка %u в списке источников %s слишком длинна."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Размонтирование CD-ROM…\n"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Использование %s в качестве точки монтирования CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Размонтирование CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Ожидание операции работы с диском…\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Монтирование CD-ROM…\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "Идентификация.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "Идентификация... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Найдена метка: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Размонтирование CD-ROM…\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "Поиск на диске индексных файлов...\n"
 
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "Поиск на диске индексных файлов..\n"
-
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3250,7 +2452,7 @@ msgstr ""
 "Найдено индексов: %zu для пакетов, %zu для источников, %zu для переводов и "
 "%zu для сигнатур\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3258,16 +2460,16 @@ msgstr ""
 "Не удалось найти ни одного файла пакетов; возможно это не диск Debian или с "
 "не той архитектурой?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Найден ярлык «%s»\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Это неправильное имя, попробуйте ещё раз.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3276,82 +2478,105 @@ msgstr ""
 "Название диска: \n"
 "«%s»\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Копирование списков пакетов…"
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Запись нового списка источников\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Записи в списке источников для этого диска:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Сохранено %i записей.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Пакет %s нуждается в переустановке, но найти архив для него не удалось."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Сохранено %i записей с %i отсутствующими файлами.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это "
+"может быть вызвано отложенными (held) пакетами."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Построение дерева зависимостей"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версии-кандидаты"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Генерирование зависимостей"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Чтение информации о состоянии"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Сохранено %i записей с %i несовпадающими файлами\n"
+msgid "Failed to open StateFile %s"
+msgstr "Не удалось открыть StateFile %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими "
-"файлами\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не удалось записать временный StateFile %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Не удалось найти аутентификационную запись для: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Невозможно разобрать содержимое пакета %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Не совпадает хеш сумма для: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Невозможно разобрать содержимое пакета %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Выпуск «%s» для «%s» не найден"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Версия «%s» для «%s» не найдена"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Не удалось найти задачу «%s»"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Не удалось найти пакет по регулярному выражению «%s»"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Не удалось найти пакет по регулярному выражению «%s»"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3360,176 +2585,243 @@ msgstr ""
 "Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так "
 "как в нём нет ни той, ни другой"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Не удалось выбрать самую новую версию из пакета «%s», так как он полностью "
 "виртуальный"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет "
 "кандидатов"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Не удалось выбрать установленную версию из пакета %s, так как он не "
 "установлен"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Отправка сценария решателю"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Невозможно разобрать содержимое файла Release (%s)"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Отправка запроса решателю"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Отсутствуют разделы в файле Release (%s)"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Подготовка к приёму решения"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Отсутствуют элементы Hash в файле Release (%s)"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Запустить внешний решатель"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Неправильный элемент «Date» в файле Release %s"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
+
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)"
+
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
+"Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Запускается dpkg"
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Некоторые индексные файлы не скачались. Они были проигнорированы или вместо "
-"них были использованы старые версии."
+"Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет "
+"значения)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr ""
+"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Искажённая строка %lu в списке источников %s (absolute dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Открытие %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Искажённая строка %u в списке источников %s (тип)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Устанавливается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Настраивается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Удаляется %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Выполняется полное удаление %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Уведомление об исчезновении %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Выполняется послеустановочный триггер %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Отсутствует каталог «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Не удалось открыть файл «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Подготавливается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Распаковывается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Подготавливается для настройки %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Установлен %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Подготавливается для удаления %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Удалён %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Подготовка к полному удалению %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s полностью удалён"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Невозможно записать в %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "Действие прервано до его завершения"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Отчёты apport не записаны, так достигнут MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "проблемы с зависимостями — оставляем ненастроенным"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3537,7 +2829,7 @@ msgstr ""
 "Отчёты apport не записаны, так как сообщение об ошибке указывает на "
 "повторную ошибку от предыдущего отказа."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3545,7 +2837,7 @@ msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
 "места на диске"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3553,7 +2845,7 @@ msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
 "памяти"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3562,14 +2854,14 @@ msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
 "места на диске"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке об ошибке "
 "ввода-выводы dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3578,7 +2870,7 @@ msgstr ""
 "Не удалось выполнить блокировку управляющего каталога (%s); он уже "
 "используется другим процессом?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3587,7 +2879,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3595,10 +2887,753 @@ msgstr ""
 "Работа dpkg прервана, вы должны вручную запустить «%s» для устранения "
 "проблемы. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Не заблокирован"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liч %liмин %liс"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%liмин %liс"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%liс"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Не найдено: %s"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+"Блокировка не используется, так как файл блокировки %s доступен только для "
+"чтения"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Не удалось открыть файл блокировки %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"Блокировка не используется, так как файл блокировки %s находится на файловой "
+"системе nfs"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Не удалось получить доступ к файлу блокировки %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "Список файлов не может быть создан, так как «%s» не является каталогом"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "Файл «%s» в каталоге «%s» игнорируется, так как это необычный файл"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет расширения"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"Файл «%s» в каталоге «%s» игнорируется, так как он не имеет неправильное "
+"расширение"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr ""
+"Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Порождённый процесс %s получил сигнал %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Порождённый процесс %s вернул код ошибки (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Порождённый процесс %s неожиданно завершился"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Проблема закрытия gzip-файла %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Не удалось открыть файл %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Не удалось открыть файловый дескриптор %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Не удалось создать IPC с порождённым процессом"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Не удалось выполнить компрессор "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr ""
+"ошибка при чтении; собирались прочесть ещё %llu байт, но ничего больше нет"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Проблема закрытия файла %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Проблема при переименовании файла %s в %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Проблема при удалении файла %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Проблема при синхронизации файла"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s… Ошибка!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s… Готово"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr "…"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Невозможно отобразить в память пустой файл"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Не удалось сделать копию файлового дескриптора %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Невозможно отобразить в память %llu байт"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Не удалось закрыть mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Не удалось синхронизировать mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Невозможно отобразить в память %lu байт"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Не удалось обрезать файл"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Start. "
+"Текущее значение: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Не удалось увеличить размер MMap, так как уже достигнут предел в %lu байт."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Не удалось увеличить размер MMap, так как автоматическое увеличение "
+"отключено пользователем."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Невозможно прочитать атрибуты точки монтирования %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Невозможно получить атрибуты cdrom"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Неизвестная аббревиатура типа: «%c»"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Открытие файла настройки %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени."
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Синтаксическая ошибка %s:%u: искажённый тег"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем "
+"уровне"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива «%s»"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Синтаксическая ошибка %s:%u: для директивы clear требуется третий параметр в "
+"качестве аргумента"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Связка ключей в %s не установлена."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Неизвестный параметр командной строки «%c» [из %s]."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Не распознанный параметр командной строки %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Параметр командной строки %s — не логический переключатель \"да/нет\""
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Для параметра %s требуется аргумент."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Значение параметра %s должно иметь вид =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Для параметра %s требуется аргумент в виде целого числа, а не «%s»"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Параметр «%s» слишком длинный"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Смысл %s не ясен, используйте true или false."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Неверная операция %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Использование: apt-extracttemplates файл1 [файл2…]\n"
+"\n"
+"apt-extracttemplates извлекает из пакетов Debian данные config и template\n"
+"\n"
+"Параметры:\n"
+"  -h   Этот текст\n"
+"  -t   Задать каталог для временных файлов\n"
+"  -c=? Читать указанный файл настройки\n"
+"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Невозможно получить атрибуты %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Невозможно определить версию debconf. Он установлен?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Список расширений, допустимых для пакетов, слишком длинен"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Ошибка обработки каталога %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Список расширений источников слишком длинен"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr ""
+"Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Использование: apt-ftparchive [параметры] команда\n"
+"Команды:  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 генерирует индексные файлы архивов Debian. Он поддерживает\n"
+"множество стилей генерации: от полностью автоматического до функциональной "
+"замены\n"
+"программ dpkg-scanpackages и dpkg-scansources\n"
+"\n"
+"apt-ftparchive генерирует файлы Package (списки пакетов) для дерева\n"
+"каталогов, содержащих файлы .deb. Файл Package включает в себя управляющие\n"
+"поля каждого пакета, а также хеш MD5 и размер файла. Значения управляющих\n"
+"полей «приоритет» (Priority) и «секция» (Section) могут быть изменены с\n"
+"помощью файла override.\n"
+"\n"
+"Кроме того, apt-ftparchive может генерировать файлы Sources из дерева\n"
+"каталогов, содержащих файлы .dsc. Для указания файла override в этом \n"
+"режиме можно использовать параметр --source-override.\n"
+"\n"
+"Команды «packages» и «sources» надо выполнять, находясь в корневом каталоге\n"
+"дерева, которое вы хотите обработать. BinaryPath должен указывать на место,\n"
+"с которого начинается рекурсивный обход, а файл переназначений (override)\n"
+"должен содержать записи о переназначениях управляющих полей. Если был "
+"указан\n"
+"Pathprefix, то его значение добавляется к управляющим полям, содержащим\n"
+"имена файлов. Пример использования для архива Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Параметры:\n"
+"  -h    Этот текст\n"
+"  --md5 Управление генерацией MD5-хешей\n"
+"  -s=?  Указать файл переназначений (override) для источников\n"
+"  -q    Не выводить сообщения в процессе работы\n"
+"  -d=?  Указать кэширующую базу данных (не обязательно)\n"
+"  --no-delink Включить режим отладки процесса удаления файлов\n"
+"  --contents  Управление генерацией полного перечня содержимого пакетов\n"
+"              (файла Contents)\n"
+"  -c=?  Использовать указанный файл настройки\n"
+"  -o=?  Задать значение произвольному параметру настройки"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Совпадений не обнаружено"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "В группе пакетов «%s» отсутствуют некоторые файлы"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "БД была повреждена, файл переименован в %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB устарела, попытка обновить %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите "
+"и создайте базу данных заново."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Не удалось открыть DB файл %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "В архиве нет поля control"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Невозможно получить курсор"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Не удалось прочитать каталог %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Не удалось прочитать атрибуты %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Ошибки относятся к файлу "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Не удалось проследовать по ссылке %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Не удалось совершить обход дерева"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Не удалось открыть %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr "DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Не удалось прочесть ссылку %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Не удалось удалить %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Не удалось создать ссылку %s на %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Превышен лимит в %sB в DeLink.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "В архиве нет поля package"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  Нет записи о переназначении (override) для %s\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  пакет %s сопровождает %s, а не %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  Нет записи source override для %s\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  Нет записи binary override для %s\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc — не удалось выделить память"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Не удалось открыть %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Не удалось прочесть файл переназначений (override) %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Неправильная запись о переназначении (override) %s в строке %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Неправильная запись о переназначении (override) %s в строке %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Неизвестный алгоритм сжатия «%s»"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr ""
+"Для получения сжатого вывода %s необходимо включить использования сжатия"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Не удалось создать FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Не удалось запустить порождённый процесс"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Процесс-потомок, производящий сжатие"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Внутренняя ошибка, не удалось создать %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Ошибка ввода/вывода в подпроцесс/файл"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Ошибка чтения во время вычисления MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Не удалось удалить %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Использование: apt-internal-solver\n"
+"\n"
+"apt-internal-solver — интерфейс к внутреннему решателю, предназначен\n"
+"для отладки, подобен интерфейсу внешнего решателя семейства APT\n"
+"\n"
+"Параметры:\n"
+"  -h   Этот текст\n"
+"  -q   Вывод протокола работы — индикатор выполнения отключён\n"
+"  -c=? Читать указанный файл настройки\n"
+"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Запись о неизвестном пакете!"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Использование: apt-sortpkgs [параметры] файл1 [файл2…]\n"
+"\n"
+"apt-sortpkgs — простой инструмент для сортировки списков пакетов. Параметр -"
+"s\n"
+"используется для указания типа списка.\n"
+"\n"
+"Параметры:\n"
+"  -h   этот текст\n"
+"  -s   сортировать список файлов пакетов исходного кода\n"
+"  -c=? читать указанный файл настройки\n"
+"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s не является правильным DEB-пакетом."
 
diff --git a/po/sk.po b/po/sk.po
index aeccfe524..884cef210 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2012-06-28 20:49+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -20,154 +20,155 @@ 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:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Celkom názvov balíkov: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Celkom štruktúr balíkov: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Normálnych balíkov: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Jednoduchých virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Zmiešaných virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Chýbajúcich: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Celkom rôznych verzií: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Celkom rôznych popisov: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Celkom závislostí: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Celkom vzťahov ver/súbor: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Celkom vzťahov popis/súbor: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Celkom poskytnutých mapovaní: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Celkom globovaných reťazcov: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Celkom miesta závislých verzií: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Celkom jalového miesta: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Celkom priradeného miesta: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Súbor balíkov %s je neaktuálny."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Neboli nájdené žiadne balíky"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Musíte zadať aspoň jeden vyhľadávací vzor"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark "
 "showauto“."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nedá sa nájsť balík %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Súbory balíka:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Pripevnené balíky:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(nenájdené)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Nainštalovaná verzia: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(žiadna)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Pripevnený balík:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Tabuľka verzií:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -238,28 +239,28 @@ msgstr ""
 "Ďalšie informácie nájdete v manuálových stránkach apt-cache(8)\n"
 "a apt.conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1“"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Vložte disk do mechaniky a stlačte Enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Pripojenie „%s“ na „%s“ zlyhalo"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Zopakujte tento postup pre všetky CD v sade diskov."
 
@@ -295,47 +296,47 @@ msgstr ""
 "  -c=? Načíta tento konfiguračný súbor\n"
 "  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Vyberá sa „%s“ ako zdrojový balík namiesto „%s“\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Ignorovať nedostupnú verziu „%s“ balíka „%s“"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Balík %s sa nedá nájsť"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s je označený ako manuálne nainštalovaný.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s je označený ako automaticky nainštalovaný.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -343,19 +344,19 @@ msgstr ""
 "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark auto“ a "
 "„apt-mark manual“."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Adresár pre sťahovanie sa nedá zamknúť"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nedá sa nájsť zdrojový balík pre %s"
@@ -382,80 +383,80 @@ msgstr ""
 "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie "
 "balíka.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, 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:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, 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:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stiahnuť zdroj %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Zlyhalo stiahnutie niektorých archívov."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Proces potomka zlyhal"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -464,17 +465,17 @@ msgstr ""
 "Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení "
 "nájdete v apt.conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žiadne závislosti na zostavenie.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -483,20 +484,20 @@ msgstr ""
 "%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch "
 "„%s“"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -505,7 +506,7 @@ msgstr ""
 "%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, "
 "nedokáže splniť požiadavky na verziu"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,30 +514,30 @@ msgid ""
 msgstr ""
 "%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Závislosti na zostavenie %s nemožno splniť."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Spracovanie závislostí na zostavenie zlyhalo"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Záznam zmien %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -624,53 +625,74 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tento APT má schopnosti posvätnej kravy.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s nemožno označiť, pretože nie je nainštalovaný.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s už bol označený ako manuálne nainštalovaný.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s už bol označený ako automaticky nainštalovaný.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s bol už nastavený na podržanie.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s bol už nastavený na nepodržanie.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Čakalo sa na %s, ale nebolo to tam"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s je označený na podržanie.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Zrušené podržanie %s.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Vykonanie dpkg zlyhalo. Ste root?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -717,7 +739,7 @@ msgstr ""
 "  -o=? Nastaviť ľubovoľný konfiguračnú voľbu, napr. -o dir::cache=/tmp\n"
 "Ďalšie informácie nájdete na manuálových stránkach apt-mark(8) a apt.conf(5)."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -765,52 +787,52 @@ msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa."
 msgid "Disk not found."
 msgstr "Disk sa nenašiel."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Súbor sa nenašiel"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Vyhodnotenie zlyhalo"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Zlyhalo nastavenie času zmeny"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Neplatné URI, lokálne URI nesmie začínať s //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Prihlasovanie"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Nedá sa zistiť názov druhej strany"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Nedá sa zistiť lokálny názov"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Server zamietol naše spojenie s chybou: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Zlyhalo zadanie používateľa, server odpovedal: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Zlyhalo zadanie hesla, server odpovedal: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -818,121 +840,123 @@ msgstr ""
 "Bol zadaný proxy server, ale nie prihlasovací skript. Acquire::ftp::"
 "ProxyLogin je prázdny."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Zlyhalo zadanie typu, server odpovedal: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Uplynul čas spojenia"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Server ukončil spojenie"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Chyba pri čítaní"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Odpoveď preplnila zásobník."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Narušenie protokolu"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Chyba pri zápise"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Nedá sa vytvoriť socket"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Chyba"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Nedá sa pripojiť pasívny socket."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nezískal počúvajúci socket"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Nedá sa nadviazať socket"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Na sockete sa nedá počúvať"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Názov socketu sa nedá zistiť"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Príkaz PORT sa nedá odoslať"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Neznáma rodina adries %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Uplynulo spojenie dátového socketu"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Spojenie sa nedá prijať"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problém s hašovaním súboru"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Uplynula doba dátového socketu"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Prenos dát zlyhal, server odpovedal „%s“"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Dotaz"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Nedá sa vyvolať "
 
@@ -968,7 +992,7 @@ msgstr "Nedá sa pripojiť k %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Pripája sa k %s"
@@ -998,36 +1022,36 @@ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Nedá sa pripojiť k %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Bola zistená aspoň jedna nesprávna signatúra."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Nedá sa spustiť „gpgv“ kvôli overeniu podpisu (je nainštalované gpgv?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Neznáma chyba pri spustení gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Nasledovné signatúry sú neplatné:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1035,148 +1059,384 @@ msgstr ""
 "Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný "
 "kľúč:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Prázdne súbory nemôžu byť platné archívy"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do tohto súboru"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Chyba pri čítaní zo servera"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Chyba zápisu do súboru"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Výber zlyhal"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Uplynul čas spojenia"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupného súboru"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Čaká sa na hlavičky"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Chybná hlavička"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP server poslal neplatnú hlavičku odpovede"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má poškodenú podporu rozsahov"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Neznámy formát dátumu"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Zlé dátové záhlavie"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Prepočítava sa aktualizácia... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Hotovo"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Opravujú sa závislosti..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " zlyhalo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Závislosti sa nedajú opraviť"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Sada na aktualizáciu sa nedá minimalizovať"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Hotovo"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nesplnené závislosti. Skúste použiť -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Nasledovné balíky majú nesplnené závislosti:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "ale nainštalovaný je %s"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale inštalovať sa bude %s"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "ale sa nedá nainštalovať"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "ale je to virtuálny balík"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "ale nie je nainštalovaný"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "ale sa nebude inštalovať"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " alebo"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Nasledovné balíky sa ODSTRÁNIA:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Nasledovné balíky sa aktualizujú:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Nasledovné balíky sa DEGRADUJÚ:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Nasledovné pridržané balíky sa zmenia:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (kvôli %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
+"Ak presne neviete, čo robíte, tak to NEROBTE!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinštalovaných, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu degradovaných, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Chyba pri preklade regulárneho výrazu - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Príkaz update neprijíma žiadne argumenty"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnútorná chyba, Triedenie sa neukončilo"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Je potrebné stiahnuť %sB archívov.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Na %s nemáte dostatok voľného miesta."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Nastali problémy a -y bolo použité bez --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Áno, urob to, čo vravím!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1187,19 +1447,19 @@ msgstr ""
 "Ak chcete pokračovať, opíšte frázu „%s“\n"
 " ?]"
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Prerušené."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovať?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Niektoré súbory sa nedajú stiahnuť"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1207,19 +1467,19 @@ msgstr ""
 "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
 "fix-missing"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Chýbajúce balíky sa nedajú opraviť."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Inštalácia sa prerušuje."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1236,15 +1496,15 @@ msgstr[2] ""
 "Nasledovné balíky zmizli z vášho systému, pretože\n"
 "všetky súbory boli prepísané inými balíkmi:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Pozn.: Toto robí dpkg automaticky a zámerne."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1262,15 +1522,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 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:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnútorná chyba, AutoRemover niečo pokazil"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1283,7 +1543,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1295,18 +1555,18 @@ msgstr[1] ""
 msgstr[2] ""
 "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Na jeho odstránenie použite „apt-get autoremove“."
 msgstr[1] "Na ich odstránenie použite „apt-get autoremove“."
 msgstr[2] "Na ich odstránenie použite „apt-get autoremove“."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1314,7 +1574,7 @@ msgstr ""
 "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
 "navrhnite riešenie)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1326,323 +1586,96 @@ msgstr ""
 "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
 "Novoprichádzajúcich (Incoming) balíkov."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Nainštalujú sa nasledovné extra balíky:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Odporúčané balíky:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Nainštalovať tieto nekontrolované balíky?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Zlyhalo stiahnutie %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Nasledovné balíky majú nesplnené závislosti:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "ale nainštalovaný je %s"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ale inštalovať sa bude %s"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "ale sa nedá nainštalovať"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "ale je to virtuálny balík"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "ale nie je nainštalovaný"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "ale sa nebude inštalovať"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " alebo"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Nasledovné balíky sa ODSTRÁNIA:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Nasledovné balíky sa aktualizujú:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Nasledovné balíky sa DEGRADUJÚ:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Nasledovné pridržané balíky sa zmenia:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (kvôli %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
-"Ak presne neviete, čo robíte, tak to NEROBTE!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinštalovaných, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu degradovaných, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Chyba pri preklade regulárneho výrazu - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Opravujú sa závislosti..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " zlyhalo."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Závislosti sa nedajú opraviť"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Sada na aktualizáciu sa nedá minimalizovať"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nesplnené závislosti. Skúste použiť -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Príkaz update neprijíma žiadne argumenty"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Prepočítava sa aktualizácia... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Hotovo"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Premenovanie %s na %s zlyhalo"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Už existuje "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Získava sa:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Chyba "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%sB sa stiahlo za %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Prebieha spracovanie]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1655,19 +1688,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nedá sa načítať %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nedá sa prejsť do %s"
@@ -1696,11 +1729,11 @@ msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle"
 msgid "[Mirror: %s]"
 msgstr "[Zrkadlo: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Spojenie bolo predčasne ukončené"
 
@@ -1740,1322 +1773,446 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Zlučujú sa dostupné informácie"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Použitie: apt-extracttemplates súbor1 [súbor2 ...]\n"
-"\n"
-"apt-extracttemplates je nástroj na vyňatie konfiguračných skriptov\n"
-"a šablón z balíkov Debian\n"
-"\n"
-"Voľby:\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"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Do %s sa nedá zapisovať"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Zoznam rozšírení balíka je príliš dlhý"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Chyba pri spracovávaní adresára %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Zoznam zdrojových rozšírení je príliš dlhý"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Chyba pri zapisovaní hlavičky do súboru"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Chyba pri spracovávaní obsahu %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Použitie: apt-ftparchive [voľby] príkaz\n"
-"Príkazy: packages binárna_cesta [súbor_override [prefix_cesty]]\n"
-"         sources zdrojová_cesta [súbor_override [prefix_cesty]]\n"
-"         contents cesta\n"
-"         release cesta\n"
-"         generate konfiguračný_súbor [skupiny]\n"
-"         clean konfiguračný_súbor\n"
-"\n"
-"apt-ftparchive generuje indexové súbory archívov Debianu. Podporuje\n"
-"niekoľko režimov vytvárania - od plne automatického až po funkčnú\n"
-"náhradu príkazov dpkg-scanpackages a dpkg-scansources.\n"
-"\n"
-"apt-ftparchive zo stromu .deb súborov vygeneruje súbory Packages. Súbor\n"
-"Packages okrem všetkých riadiacich polí každého balíka obsahuje tiež jeho\n"
-"veľkosť a MD5 súčet. Podporovaný je tiež súbor „override“, pomocou ktorého\n"
-"môžete vynútiť hodnoty polí Priority a Section.\n"
-"\n"
-"Podobne vie apt-ftparchive vygenerovať zo stromu súborov .dsc súbory\n"
-"Sources. Voľbou --source-override môžete určiť zdrojový súbor „override“.\n"
-"\n"
-"Príkazy „packages“ a „sources“ by sa mali spúšťať v koreni stromu.\n"
-"Binárna_cesta by mala ukazovať na začiatok rekurzívneho hľadania\n"
-"a súbor „override“ by mal obsahovať príznaky pre nahradenie. Ak je udaný\n"
-"prefix_cesty, pridá sa do polí „filename“.\n"
-"Skutočný príklad z archívu Debianu:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Voľby:\n"
-"  -h    Tento pomocník\n"
-"  --md5 Vygeneruje kontrolný súčet MD5\n"
-"  -s=?  Zdrojový súbor „override“\n"
-"  -q    Tichý režim\n"
-"  -d=?  Zvolí voliteľnú databázu pre vyrovnávaciu pamäť\n"
-"  --no-delink Povolí ladiaci režim\n"
-"  --contents  Vygeneruje súbor Contents\n"
-"  -c=?  Načíta tento konfiguračný súbor\n"
-"  -o=?  Nastaví ľubovoľnú voľbu"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Nevyhovel žiaden výber"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "V súbore balíka skupiny „%s“ chýbajú niektoré súbory"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB je narušená, súbor je premenovaný na %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte "
-"odstrániť a znovu vytvoriť databázu."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nedá sa otvoriť DB súbor %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%s sa nedá vyhodnotiť"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Archív nemá riadiaci záznam"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Nedá sa získať kurzor"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Adresár %s sa nedá čítať\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: %s sa nedá vyhodnotiť\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Chyby sa týkajú súboru "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Chyba pri preklade %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Prechod stromom zlyhal"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s sa nedá otvoriť"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Odlinkovanie %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Nie je možné vykonať readlink %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Nie je možné vykonať unlink %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Nepodarilo sa zlinkovať %s s %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Archív neobsahuje pole „package“"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s nemá žiadnu položku override\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  správcom %s je %s, nie %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s nemá žiadnu položku „source override“\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s nemá žiadnu položku „binary override“\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Zlyhal pokus o pridelenie pamäti"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Nedá sa otvoriť %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Skomolený „override“ %s riadok %llu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nepodarilo sa prečítať „override“ súbor %s"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Skomolený „override“ %s riadok %llu #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Skomolený „override“ %s riadok %llu #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Skomolený „override“ %s riadok %llu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Neznámy kompresný algoritmus „%s“"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Zlyhalo vytvorenie FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Volanie fork() zlyhalo"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Komprimovať potomka"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "V/V operácia s podprocesom/súborom zlyhala"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Chyba čítania pri výpočte MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problém s odlinkovaním %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Premenovanie %s na %s zlyhalo"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Použitie: apt-internal-solver\n"
-"\n"
-"apt-internal-solver je rozhranie na použitie aktuálneho vnútorného\n"
-"riešiteľa ako vonkajší pre rodinu APT na ladenie a pod.\n"
-"\n"
-"Voľby:\n"
-"  -h   Tento pomocník.\n"
-"  -q   Výstup vhodný do záznamu - bez indikátora priebehu\n"
-"  -c=? Načíta tento konfiguračný súbor\n"
-"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Neznámy záznam o balíku!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Použitie: apt-sortpkgs [voľby] súbor1 [súbor2 ...]\n"
-"\n"
-"apt-sortpkgs je jednoduchý nástroj na zotriedenie súborov Packages.\n"
-"Voľbou -s si zvolíte typ súboru.\n"
-"\n"
-"Voľby:\n"
-"  -h   Tento pomocník\n"
-"  -s   Zotriedi zdrojový súbor\n"
-"  -c=? Načíta tento konfiguračný súbor\n"
-"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Vytvorenie rúry zlyhalo"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Spustenie gzip zlyhalo "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Porušený archív"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Neznáma TAR hlavička typu %u, člen %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Neplatný podpis archívu"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Chyba pri čítaní záhlavia prvku archívu"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Neplatná hlavička prvku archívu %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Neplatné záhlavie prvku archívu"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Archív je príliš krátky"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Chyba pri čítaní hlavičiek archívu"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Hašovací prvok sa nedá nájsť!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Nedá sa alokovať diverzia"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Vnútorná chyba pri AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dvojité pridanie diverzie %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Duplicitný konfiguračný súbor %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Zápis súboru %s zlyhal"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Zatvorenie súboru %s zlyhalo"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Cesta %s je príliš dlhá"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s sa rozbaľuje viackrát"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Adresár %s je divertovaný"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Balík sa pokúša zapisovať do diverzného cieľa %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Diverzná cesta je príliš dlhá"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s sa nedá vyhodnotiť"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Premenovanie %s na %s zlyhalo"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Adresár %s sa nahradí neadresárom"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Nedá sa nájsť uzol na adrese jeho hašu"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Cesta je príliš dlhá"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nedá sa vyhodnotiť %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Zápis súboru %s zlyhal"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Zatvorenie súboru %s zlyhalo"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Toto nie je platný DEB archív, chýba časť „%s“"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Vnútorná chyba, nedá sa nájsť časť %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Nespracovateľný riadiaci súbor"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Nedá sa vykonať mmap prázdneho súboru"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Nedá sa duplikovať popisovač súboru %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Nedá sa urobiť mmap %llu bajtov"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Nedá sa zatvoriť mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Nedá sa synchronizovať mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Nedá sa urobiť mmap %lu bajtov"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Nepodarilo sa skrátiť súbor"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
-"Start. Aktuálna hodnota: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Napodarilo sa zväčšiť veľkosť MMap, pretože limit %lu už bol dosiahnutý."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Napodarilo sa zväčšiť veľkosť MMap, pretože automatické zväčovanie vypol "
-"používateľ."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li h %li min %li s"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%li min %li s"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%li s"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Voľba %s nenájdená"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Nerozpoznaná skratka typu: „%c“"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Neplatný podpis archívu"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Otvára sa konfiguračný súbor %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Chyba pri čítaní záhlavia prvku archívu"
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Syntaktická chyba %s:%u: Blok začína bez názvu."
+msgid "Invalid archive member header %s"
+msgstr "Neplatná hlavička prvku archívu %s"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaktická chyba %s:%u: Skomolená značka"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Neplatné záhlavie prvku archívu"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Syntaktická chyba %s:%u: Za hodnotou nasledujú chybné údaje"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Archív je príliš krátky"
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Chyba pri čítaní hlavičiek archívu"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntaktická chyba %s:%u: Príliš mnoho vnorených prepojení (include)"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Vytvorenie rúry zlyhalo"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Spustenie gzip zlyhalo "
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Porušený archív"
 
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Syntaktická chyba %s:%u: direktíva clear vyžaduje ako argument strom volieb"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-inst/contrib/extracttar.cc:308
 #, 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"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Neznáma TAR hlavička typu %u, člen %s"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Chyba!"
+msgid "Unable to stat %s."
+msgstr "Nie je možné vykonať stat %s."
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Hotovo"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Hotovo"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Parameter príkazového riadka „%c“ [z %s] je neznámy"
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Nezrozumiteľný parameter %s na príkazovom riadku"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Parameter príkazového riadku %s nie je pravdivostná hodnota"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Voľba %s vyžaduje argument."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Parameter %s: Zadanie konfiguračnej položky musí obsahovať =<hodn>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Voľba %s vyžaduje ako argument celé číslo (integer), nie „%s“"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Voľba „%s“ je príliš dlhá"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Nezrozumiteľný význam %s, skúste true alebo false. "
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Neplatná operácia %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Prípojný bod %s sa nedá vyhodnotiť"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Nedá sa vykonať stat() CD-ROM"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problém pri zatváraní gzip súboru %s"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepoužíva"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Súbor zámku %s sa nedá otvoriť"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, 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"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Zámok %s sa nedá získať"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Zoznam súborov nemožno vytvoriť, pretože „%s“ nie je adresár"
-
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože to nie je obyčajný súbor"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Spúšťa sa dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože nemá príponu názvu súboru"
+msgid "Packaging system '%s' is not supported"
+msgstr "Systém balíkov „%s“ nie je podporovaný"
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
-"Ignoruje sa „%s“ v adresári „%s“, pretože má neplatnú príponu názvu súboru"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Nedá sa určiť vhodný typ systému balíkov"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Podproces %s obdržal chybu segmentácie."
+msgid "Wrote %i records.\n"
+msgstr "Zapísaných %i záznamov.\n"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Podproces %s dostal signál %u."
+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/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Podproces %s vrátil chybový kód (%u)"
+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/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Podproces %s neočakávane skončil"
+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"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open file %s"
-msgstr "Nedá sa otvoriť súbor %s"
+msgid "Can't find authentication record for: %s"
+msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Nedá sa otvoriť popisovač súboru %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Nedá sa vytvoriť podproces IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Nepodarilo sa spustiť kompresor "
+msgid "Hash mismatch for: %s"
+msgstr "Nezhoda kontrolných haš súčtov: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "čítanie, treba prečítať ešte %llu, ale už nič neostáva"
+msgid "The method driver %s could not be found."
+msgstr "Nedá sa nájsť ovládač spôsobu %s."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "zápis, treba zapísať ešte %llu, no nedá sa to"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "Problém pri zatváraní súboru %s"
+msgid "Method %s did not start correctly"
+msgstr "Spôsob %s nebol správne spustený"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problém pri synchronizovaní súboru %s na %s"
+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/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problém pri odstraňovaní súboru %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvoriť."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problém pri synchronizovaní súboru"
+#: apt-pkg/cachefile.cc:98
+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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Nedá sa načítať zoznam zdrojov."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Vyrovnávacia pamäť balíkov je prázdna"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 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:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený, je príliš malý"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 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:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Závisí na"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Predzávisí na"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Odporúča"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Nahrádza"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Zneplatňuje"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Kazí"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Rozširuje"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "dôležitý"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "požadovaný"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "štandardný"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "voliteľný"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Vytvára sa strom závislostí"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Kandidátske verzie"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Generovanie závislostí"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Načítavajú sa stavové informácie"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie je možné otvoriť StateFile %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie je možné zapísať dočasný StateFile %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Súbor %s sa nedá spracovať (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Súbor %s sa nedá spracovať (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Otvára sa %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v "
-"man 5 apt.conf pod APT::Immediate-Configure (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Nedá sa nakonfigurovať „%s“."
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Tento beh inštalácie si vyžiada dočasné odstránenie kľúčového balíka %s "
-"kvôli slučke v Conflicts/Pre-Depends. Často je to nevhodné, ale ak to chcete "
-"naozaj urobiť, aktivujte možnosť APT::Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indexový súbor typu „%s“ nie je podporovaný"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "Je nutné preinštalovať balík %s, ale nedá sa nájsť jeho archív."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
-"pridržanými balíkmi."
-
-#: apt-pkg/algorithms.cc:1070
-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/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Adresár zoznamov %spartial chýba."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Archívny adresár %spartial chýba."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Adresár %s sa nedá zamknúť"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, 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:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Sťahuje sa %li. súbor z %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nedá sa nájsť ovládač spôsobu %s."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Spôsob %s nebol správne spustený"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Systém balíkov „%s“ nie je podporovaný"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Nedá sa určiť vhodný typ systému balíkov"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nie je možné vykonať stat %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvoriť."
-
-#: apt-pkg/cachefile.cc:91
-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/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Nedá sa načítať zoznam zdrojov."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"„%s“ nie je platná hodnota pre APT::Default-Release, pretože také vydanie "
-"nie je dostupné v zdrojoch"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Neplatný záznam v súbore nastavení %s, chýba hlavička Package"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Nezrozumiteľné pridržanie typu %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Fíha, prekročili ste počet popisov, ktoré toto APT zvládne spracovať."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Načítavajú sa zoznamy balíkov"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Collecting File poskytuje"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Do %s sa nedá zapisovať"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Poslať scénár riešiteľovi"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Poslať požiadavku riešiteľovi"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Pripraviť sa na prijatie riešenia"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Spustiť externého riešiteľa"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "premenovanie zlyhalo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Nezhoda kontrolných haš súčtov"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Veľkosti sa nezhodujú"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Neplatná operácia %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3064,16 +2221,16 @@ msgstr ""
 "Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna "
 "položka sources.list alebo chybný formát súboru)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3082,12 +2239,12 @@ msgstr ""
 "Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja "
 "softvéru sa nepoužijú."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3097,12 +2254,12 @@ msgstr ""
 "použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Chyba GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3111,82 +2268,145 @@ msgstr ""
 "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
 "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nedá spracovať súbor Release %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Žiadne sekcie v Release súbore %s"
+msgid "List directory %spartial is missing."
+msgstr "Adresár zoznamov %spartial chýba."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Chýba položka „Hash“ v súbore Release %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Archívny adresár %spartial chýba."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Chýba položka „Valid-Until“ v súbore Release %s"
+msgid "Unable to lock directory %s"
+msgstr "Adresár %s sa nedá zamknúť"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Chýba položka „Date“ v súbore Release %s"
+msgid "Retrieving file %li of %li"
+msgstr "Sťahuje sa %li. súbor z %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Niektoré indexové súbory sa nepodarilo stiahnuť. Boli ignorované alebo sa "
+"použili staršie verzie."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"„%s“ nie je platná hodnota pre APT::Default-Release, pretože také vydanie "
+"nie je dostupné v zdrojoch"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Neplatný záznam v súbore nastavení %s, chýba hlavička Package"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Nezrozumiteľné pridržanie typu %s"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v "
+"man 5 apt.conf pod APT::Immediate-Configure (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nedá sa nakonfigurovať „%s“."
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Tento beh inštalácie si vyžiada dočasné odstránenie kľúčového balíka %s "
+"kvôli slučke v Conflicts/Pre-Depends. Často je to nevhodné, ale ak to chcete "
+"naozaj urobiť, aktivujte možnosť APT::Force-LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM sa odpája...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Použije sa prípojný bod CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "CD-ROM sa odpája\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Čaká sa na disk...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Pripája sa CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "Identifikuje sa.."
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "Identifikuje sa..."
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Uložená menovka: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM sa odpája...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "Na disku sa hľadajú indexové súbory..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "Na disku sa hľadajú indexové súbory...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3195,7 +2415,7 @@ 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:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3203,16 +2423,16 @@ msgstr ""
 "Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom "
 "alebo je pre nesprávnu architektúru?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Nájdená menovka: „%s“\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Neplatný názov, skúste znova.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3221,79 +2441,103 @@ msgstr ""
 "Názov tohto disku je: \n"
 "„%s“\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Kopírujú sa zoznamy balíkov..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Zapisuje sa nový zoznam zdrojov\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Zapísaných %i záznamov.\n"
+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/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, 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/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
+"pridržanými balíkmi."
+
+#: apt-pkg/algorithms.cc:1088
+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/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytvára sa strom závislostí"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidátske verzie"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generovanie závislostí"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Načítavajú sa stavové informácie"
+
+#: apt-pkg/depcache.cc:250
 #, 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"
+msgid "Failed to open StateFile %s"
+msgstr "Nie je možné otvoriť StateFile %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, 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"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie je možné zapísať dočasný StateFile %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Súbor %s sa nedá spracovať (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Nezhoda kontrolných haš súčtov: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Súbor %s sa nedá spracovať (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Nebola nájdená verzia „%s“ pre „%s“"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nebolo možné nájsť úlohu „%s“"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Nie je možné vybrať verzie z balíka „%s“, pretože je čisto virtuálny"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3302,175 +2546,239 @@ msgstr ""
 "Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, "
 "pretože nemá žiadnu z nich"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je čisto "
 "virtuálny"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Nie je možné vybrať kandidátsku verziu z balíka „%s“, pretože nemá kandidáta"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Nie je možné vybrať nainštalovanú verziu z balíka „%s“, pretože nie je "
 "nainštalovaný"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Poslať scénár riešiteľovi"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nedá spracovať súbor Release %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Poslať požiadavku riešiteľovi"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Žiadne sekcie v Release súbore %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Pripraviť sa na prijatie riešenia"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Chýba položka „Hash“ v súbore Release %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Chýba položka „Valid-Until“ v súbore Release %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Spustiť externého riešiteľa"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Chýba položka „Date“ v súbore Release %s"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Spúšťa sa dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Niektoré indexové súbory sa nepodarilo stiahnuť. Boli ignorované alebo sa "
-"použili staršie verzie."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Otvára sa %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Inštaluje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraňuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Úplne sa odstraňuje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Zaznamenali sme zmiznutie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Vykonáva sa spúšťač post-installation %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresár „%s“ chýba"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nedá sa otvoriť súbor „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaľuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pripravuje sa nastavenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Nainštalovaný balík %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Pripravuje sa odstránenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Odstránený balík %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Pripravuje sa úplné odstránenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Balík „%s“ je úplne odstránený"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Do %s sa nedá zapisovať"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3478,7 +2786,7 @@ msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v "
 "nadväznosti na predošlé zlyhanie."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3486,7 +2794,7 @@ msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
 "zaplnený"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3494,7 +2802,7 @@ msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
 "pamäte"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3503,36 +2811,762 @@ msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
 "zaplnený"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje V/V chybu dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s“. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Nie je zamknuté"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li min %li s"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li s"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Voľba %s nenájdená"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepoužíva"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Súbor zámku %s sa nedá otvoriť"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, 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"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Zámok %s sa nedá získať"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "Zoznam súborov nemožno vytvoriť, pretože „%s“ nie je adresár"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože to nie je obyčajný súbor"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože nemá príponu názvu súboru"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"Ignoruje sa „%s“ v adresári „%s“, pretože má neplatnú príponu názvu súboru"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Podproces %s obdržal chybu segmentácie."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Podproces %s dostal signál %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Podproces %s neočakávane skončil"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problém pri zatváraní gzip súboru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Nedá sa otvoriť súbor %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nedá sa otvoriť popisovač súboru %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Nedá sa vytvoriť podproces IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Nepodarilo sa spustiť kompresor "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "čítanie, treba prečítať ešte %llu, ale už nič neostáva"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "zápis, treba zapísať ešte %llu, no nedá sa to"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problém pri zatváraní súboru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problém pri synchronizovaní súboru %s na %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problém pri odstraňovaní súboru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problém pri synchronizovaní súboru"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Chyba!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Hotovo"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Hotovo"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Nedá sa vykonať mmap prázdneho súboru"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Nedá sa duplikovať popisovač súboru %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Nedá sa urobiť mmap %llu bajtov"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Nedá sa zatvoriť mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Nedá sa synchronizovať mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nedá sa urobiť mmap %lu bajtov"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Nepodarilo sa skrátiť súbor"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
+"Start. Aktuálna hodnota: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Napodarilo sa zväčšiť veľkosť MMap, pretože limit %lu už bol dosiahnutý."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Napodarilo sa zväčšiť veľkosť MMap, pretože automatické zväčovanie vypol "
+"používateľ."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Prípojný bod %s sa nedá vyhodnotiť"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Nedá sa vykonať stat() CD-ROM"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Nerozpoznaná skratka typu: „%c“"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Otvára sa konfiguračný súbor %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaktická chyba %s:%u: Skomolená značka"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Syntaktická chyba %s:%u: direktíva clear vyžaduje ako argument strom volieb"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, 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"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Parameter príkazového riadka „%c“ [z %s] je neznámy"
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Nezrozumiteľný parameter %s na príkazovom riadku"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Parameter príkazového riadku %s nie je pravdivostná hodnota"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Voľba %s vyžaduje argument."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Parameter %s: Zadanie konfiguračnej položky musí obsahovať =<hodn>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Voľba %s vyžaduje ako argument celé číslo (integer), nie „%s“"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Voľba „%s“ je príliš dlhá"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Nezrozumiteľný význam %s, skúste true alebo false. "
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Neplatná operácia %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Použitie: apt-extracttemplates súbor1 [súbor2 ...]\n"
+"\n"
+"apt-extracttemplates je nástroj na vyňatie konfiguračných skriptov\n"
+"a šablón z balíkov Debian\n"
+"\n"
+"Voľby:\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"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nedá sa vyhodnotiť %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Zoznam rozšírení balíka je príliš dlhý"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Chyba pri spracovávaní adresára %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Zoznam zdrojových rozšírení je príliš dlhý"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Chyba pri zapisovaní hlavičky do súboru"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Chyba pri spracovávaní obsahu %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Použitie: apt-ftparchive [voľby] príkaz\n"
+"Príkazy: packages binárna_cesta [súbor_override [prefix_cesty]]\n"
+"         sources zdrojová_cesta [súbor_override [prefix_cesty]]\n"
+"         contents cesta\n"
+"         release cesta\n"
+"         generate konfiguračný_súbor [skupiny]\n"
+"         clean konfiguračný_súbor\n"
+"\n"
+"apt-ftparchive generuje indexové súbory archívov Debianu. Podporuje\n"
+"niekoľko režimov vytvárania - od plne automatického až po funkčnú\n"
+"náhradu príkazov dpkg-scanpackages a dpkg-scansources.\n"
+"\n"
+"apt-ftparchive zo stromu .deb súborov vygeneruje súbory Packages. Súbor\n"
+"Packages okrem všetkých riadiacich polí každého balíka obsahuje tiež jeho\n"
+"veľkosť a MD5 súčet. Podporovaný je tiež súbor „override“, pomocou ktorého\n"
+"môžete vynútiť hodnoty polí Priority a Section.\n"
+"\n"
+"Podobne vie apt-ftparchive vygenerovať zo stromu súborov .dsc súbory\n"
+"Sources. Voľbou --source-override môžete určiť zdrojový súbor „override“.\n"
+"\n"
+"Príkazy „packages“ a „sources“ by sa mali spúšťať v koreni stromu.\n"
+"Binárna_cesta by mala ukazovať na začiatok rekurzívneho hľadania\n"
+"a súbor „override“ by mal obsahovať príznaky pre nahradenie. Ak je udaný\n"
+"prefix_cesty, pridá sa do polí „filename“.\n"
+"Skutočný príklad z archívu Debianu:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Voľby:\n"
+"  -h    Tento pomocník\n"
+"  --md5 Vygeneruje kontrolný súčet MD5\n"
+"  -s=?  Zdrojový súbor „override“\n"
+"  -q    Tichý režim\n"
+"  -d=?  Zvolí voliteľnú databázu pre vyrovnávaciu pamäť\n"
+"  --no-delink Povolí ladiaci režim\n"
+"  --contents  Vygeneruje súbor Contents\n"
+"  -c=?  Načíta tento konfiguračný súbor\n"
+"  -o=?  Nastaví ľubovoľnú voľbu"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Nevyhovel žiaden výber"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "V súbore balíka skupiny „%s“ chýbajú niektoré súbory"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB je narušená, súbor je premenovaný na %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte "
+"odstrániť a znovu vytvoriť databázu."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nedá sa otvoriť DB súbor %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Archív nemá riadiaci záznam"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Nedá sa získať kurzor"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Adresár %s sa nedá čítať\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: %s sa nedá vyhodnotiť\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Chyby sa týkajú súboru "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Chyba pri preklade %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Prechod stromom zlyhal"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s sa nedá otvoriť"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " Odlinkovanie %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Nie je možné vykonať readlink %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Nie je možné vykonať unlink %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Nepodarilo sa zlinkovať %s s %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Archív neobsahuje pole „package“"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr " %s nemá žiadnu položku override\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  správcom %s je %s, nie %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr " %s nemá žiadnu položku „source override“\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr " %s nemá žiadnu položku „binary override“\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Zlyhal pokus o pridelenie pamäti"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nedá sa otvoriť %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Skomolený „override“ %s riadok %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nepodarilo sa prečítať „override“ súbor %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Skomolený „override“ %s riadok %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Skomolený „override“ %s riadok %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Skomolený „override“ %s riadok %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Neznámy kompresný algoritmus „%s“"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Zlyhalo vytvorenie FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Volanie fork() zlyhalo"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Komprimovať potomka"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "V/V operácia s podprocesom/súborom zlyhala"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Chyba čítania pri výpočte MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problém s odlinkovaním %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Použitie: apt-internal-solver\n"
+"\n"
+"apt-internal-solver je rozhranie na použitie aktuálneho vnútorného\n"
+"riešiteľa ako vonkajší pre rodinu APT na ladenie a pod.\n"
+"\n"
+"Voľby:\n"
+"  -h   Tento pomocník.\n"
+"  -q   Výstup vhodný do záznamu - bez indikátora priebehu\n"
+"  -c=? Načíta tento konfiguračný súbor\n"
+"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Neznámy záznam o balíku!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Použitie: apt-sortpkgs [voľby] súbor1 [súbor2 ...]\n"
+"\n"
+"apt-sortpkgs je jednoduchý nástroj na zotriedenie súborov Packages.\n"
+"Voľbou -s si zvolíte typ súboru.\n"
+"\n"
+"Voľby:\n"
+"  -h   Tento pomocník\n"
+"  -s   Zotriedi zdrojový súbor\n"
+"  -c=? Načíta tento konfiguračný súbor\n"
+"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s nie je platný balík DEB."
 
diff --git a/po/sl.po b/po/sl.po
index 721aae6d2..8cfd1281a 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2012-06-27 21:29+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -20,152 +20,153 @@ msgstr ""
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Vseh imen paketov: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Skupno struktur paketov : "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Običajni paketi: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Čisti navidezni paketi: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Posamezni navidezni paketi: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Mešani navidezni paketi: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Manjka: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Vseh različic: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Skupno različnih opisov: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Vseh odvisnosti: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Vseh povezav Raz/Dat: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Skupno razmerij opisov/datotek: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Vseh dobljenih preslikav: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Vseh razširjenih nizov: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Celotna velikost z odvisnostmi različice: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Celotna ohlapna velikost: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Celotna velikost, izračunana za: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Datoteka paketa %s ni usklajena."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Noben paket ni bil najden"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Podati morate vsaj en iskalni vzorec"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark showauto'."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ni mogoče najti paketa %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Predpomnilnik ni usklajen, x-ref datoteke paketa ni mogoč"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Pripeti paketi:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(ni najdeno)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Nameščen: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(brez)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Bucika paketa: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Preglednica različic:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s za %s kodno preveden na %s %s\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -236,28 +237,28 @@ msgstr ""
 "Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt."
 "conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Navedite ime tega diska, kot je naprimer 'Debian 5.0.3 disk 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Vstavite disk v pogon in pritisnite vnosno tipko"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Priklapljanje '%s' na '%s' je spodletelo"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ponovi to opravilo za preostanek CD-jev v vaši zbirki."
 
@@ -293,47 +294,47 @@ msgstr ""
 "  -c=? Prebere podano datoteko z nastavitvami\n"
 "  -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Izbiranje '%s' kot vir paketa namesto '%s'\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Prezri nerazpoložljivo različico '%s' paketa '%s'"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ni mogoče najti paketa %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s je bil nastavljen na ročno nameščen.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s je nastavljen na samodejno nameščen.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -341,20 +342,20 @@ msgstr ""
 "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark auto' in 'apt-mark "
 "manual'."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Notranja napaka, reševalnik težav je pokvaril stvari"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Ni mogoče zakleniti mape prejemov"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Izvornega paketa za %s ni mogoče najti"
@@ -379,80 +380,80 @@ msgstr ""
 "bzr branch %s\n"
 "za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskok že prejete datoteke '%s'\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ni mogoče določiti prostega prostora v %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nimate dovolj prostora na %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Dobi vir %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Nekaterih arhivov ni mogoče pridobiti."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Prejem je dokončan in uporabljen je način samo prejema"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo preskočeno\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Ukaz gradnje '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Podrejeno opravilo ni uspelo"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -461,17 +462,17 @@ msgstr ""
 "Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte "
 "apt.conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nima odvisnosti za gradnjo.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -479,20 +480,20 @@ msgid ""
 msgstr ""
 "odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, 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:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -501,7 +502,7 @@ msgstr ""
 "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa "
 "%s ne more zadostiti zahtev različice"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -510,30 +511,30 @@ msgstr ""
 "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa "
 "%s nima različice kandidata"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Obdelava odvisnosti za gradnjo je spodletela"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Dnevnik sprememb za %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Podprti moduli:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -620,53 +621,75 @@ msgstr ""
 " sources.list(5) in apt.conf(5). \n"
 "                       Ta APT ima moči super krav.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+"Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "paket %s ne more biti označen, ker ni nameščen.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "paket %s je bil že nastavljen na ročno nameščen.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "paket %s je bil že nastavljen kot samodejno nameščen.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "paket %s je bil že nastavljen kot na čakanju.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Program je čakal na %s a ga ni bilo tam"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "paket %s je nastavljen kot na čakanju.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Čakanje za %s je bilo preklicano.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Izvajanje dpkg je spodletelo. Ali ste skrbnik?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -712,7 +735,7 @@ msgstr ""
 "  -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/tmp\n"
 "Za več podrobnosti si oglejte strani priročnika apt-mark(8) in apt-conf(5)."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -760,52 +783,52 @@ msgstr "Ni mogoče odklopiti CD-ROM-a v %s, ker je morda še v uporabi."
 msgid "Disk not found."
 msgstr "Diska ni mogoče najti."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Datoteke ni mogoče najti"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Določitev ni uspela"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Nastavitev časa spremembe je spodletela"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Neveljaven URI. Krajevni URI-ji se morajo začeti z //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Prijavljanje"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Ni mogoče ugotoviti imena gostitelja"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Ni mogoče določiti krajevnega imena"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Strežnik je zavrnil povezavo in sporočil: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER je spodletel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS je spodletel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -813,121 +836,123 @@ msgstr ""
 "Naveden je bil posredniški strežnik, ne pa tudi prijavni skript. Acquire::"
 "ftp::ProxyLogin je prazen."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Ukaz prijavne skripte '%s' ni uspel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE je spodletel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Povezava je zakasnela"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Strežnik je zaprl povezavo"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Napaka branja"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Odgovor je prekoračil predpomnilnik."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Okvara protokola"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Napaka pisanja"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Ni mogoče ustvariti vtiča"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Ni mogoče povezati podatkovnega vtiča. Povezava je zakasnela."
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Spodletelo"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Ni mogoče povezat pasivnega vtiča."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ni mogel dobiti poslušajočega vtiča"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Ni mogoče povezati vtiča"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Ni mogoče poslušati na vtiču"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Ni mogoče določiti imena vtiča"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Ni mogoče poslati ukaza PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Neznan naslov družine %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ni uspel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Povezava podatkovne vtičnice je zakasnela"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Ni mogoče sprejeti povezave"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Težava med razprševanjem datoteke"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Ni mogoče pridobiti datoteke, strežnik je odgovoril '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Podatkovna vtič je potekel"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Prenos podatkov ni uspel, strežnik je odgovoril '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Poizvedba"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Ni mogoče klicati "
 
@@ -963,7 +988,7 @@ msgstr "Ni se mogoče povezati z %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezovanje z %s"
@@ -993,185 +1018,423 @@ msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Ni se mogoče povezati z %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Notranja napaka: Dober podpis, toda ni mogoče določiti podpisa ključa?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Najden je bil vsaj en neveljaven podpis."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameščen?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Neznana napaka med izvajanjem gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Naslednji podpisi so bili neveljavni:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 "Naslednjih podpisov ni mogoče preveriti, ker javni ključ ni na voljo:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Prazne datoteke ne morejo biti veljavni arhivi"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Napaka med pisanjem v datoteko"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Napaka med branjem s strežnika"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Napaka med pisanjem v datoteko"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Izbira ni uspela"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Povezava je zakasnela"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Napaka med pisanjem v izhodno datoteko"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Čakanje na glave"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Neveljavna vrstica glave"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Strežnik HTTP je poslal neveljavno glavo odgovora"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Strežnik HTTP je poslal glavo z neveljavno dolžino vsebine"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Strežnik HTTP je poslal glavo z neveljavnim obsegom vsebine"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Neznana oblika datuma"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Napačni podatki glave"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Preračunavanje nadgradnje ... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Notranja napaka zaradi AllUpgrade."
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Opravljeno"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Popravljanje odvisnosti ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " spodletelo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ni mogoče popraviti odvisnosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Opravljeno"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nerešene odvisnosti. Poskusite uporabiti -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Naslednji paketi imajo nerešene odvisnosti:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "vendar je paket %s nameščen"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "vendar bo paket %s nameščen"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "vendar se ga ne da namestiti"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "vendar je navidezen paket"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "vendar ni nameščen"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "vendar ne bo nameščen"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " ali"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Naslednji NOVI paketi bodo nameščeni:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Naslednji paketi so bili zadržani:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Naslednji paketi bodo nadgrajeni:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Naslednji paketi bodo POSTARANI:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Naslednji zadržani paketi bodo spremenjeni:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (zaradi %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
+"Tega NE storite, razen če ne veste natanko kaj počenjate!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu posodobljenih, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu postaranih, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Napaka med prevajanjem logičnega izraza - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Ukaz update ne sprejema argumentov"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Odstraniti je treba pakete, a je odstranjevanje onemogočeno."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Notranja napaka, Urejanje se ni končalo"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
-"Kako čudno .. Velikosti se ne ujemata, pošljite sporočilo na apt@packages."
+"Kako čudno ... Velikosti se ne ujemata, pošljite sporočilo na apt@packages."
 "debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Potrebno je dobiti %sB/%sB arhivov.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Potrebno je dobiti %sB arhivov.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Na %s je premalo prostora."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 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"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Navedena je možnost Samo preprosto, a to opravilo ni preprosto."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Da, naredi tako kot pravim!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1182,19 +1445,19 @@ msgstr ""
 "Za nadaljevanje vtipkajte frazo '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Prekini."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Ali želite nadaljevati?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Prejem nekaterih datotek ni uspel"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1202,19 +1465,19 @@ msgstr ""
 "Nekaterih arhivov ni mogoče dobiti. Poskusite uporabiti apt-get update ali --"
 "fix-missing."
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing in izmenjava medija trenutno nista podprta"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Ni mogoče popraviti manjkajočih paketov."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Prekinjanje namestitve."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1234,17 +1497,17 @@ msgstr[3] ""
 "Naslednji paketi so izginili z vašega sistema, ker so vse\n"
 "datoteke prepisali drugi paketi:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Opomba: To je dpkg storil samodejno in namenoma."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Program ne bi smel brisati stvari, ni mogoče zagnati "
 "SamodejnegaOdstranjevalnika"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1263,15 +1526,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Naslednji podatki vam bodo morda pomagali rešiti težavo:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Notranja napaka, SamodejniOdstranjevalnik je pokvaril stvari"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1283,7 +1546,7 @@ msgstr[2] ""
 "Naslednja paketa sta bila samodejno nameščena in nista več zahtevana:"
 msgstr[3] "Naslednji paketi so bili samodejno nameščeni in niso več zahtevani:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1293,7 +1556,7 @@ msgstr[1] "%lu paket je bil samodejno nameščen in ni bil več zahtevan.\n"
 msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n"
 msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Uporabite 'apt-get autoremove' za njihovo odstranitev."
@@ -1301,11 +1564,11 @@ msgstr[1] "Uporabite 'apt-get autoremove' za njegovo odstranitev."
 msgstr[2] "Uporabite 'apt-get autoremove' za njuno odstranitev."
 msgstr[3] "Uporabite 'apt-get autoremove' za njihovo odstranitev."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Poskusite zagnati 'apt-get -f install', če želite popraviti naslednje:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1313,7 +1576,7 @@ msgstr ""
 "Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
 "navedite rešitev)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1325,324 +1588,96 @@ msgstr ""
 ", da nekateri zahtevani paketi še niso ustvarjeni ali premaknjeni\n"
 " iz Prihajajočega."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Pokvarjeni paketi"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Naslednji dodatni paketi bodo nameščeni:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Predlagani paketi:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Priporočeni paketi:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"OPOMBA: To je samo simulacija!\n"
+"     apt-get za pravo izvajanje potrebuje privilegije skrbnika.\n"
+"     Zaklepanje je onemogočeno, zato se ne zanašajte\n"
+"     na pomembnost trenutnega pravega stanja!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Opozorilo overitve je bilo prepisano.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Nekaterih paketkov bi bilo mogoče overiti"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Ali želite te pakete namestiti brez preverjanja?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ni mogoče dobiti %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Naslednji paketi imajo nerešene odvisnosti:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "vendar je paket %s nameščen"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "vendar bo paket %s nameščen"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "vendar se ga ne da namestiti"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "vendar je navidezen paket"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "vendar ni nameščen"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "vendar ne bo nameščen"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " ali"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Naslednji NOVI paketi bodo nameščeni:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Naslednji paketi so bili zadržani:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Naslednji paketi bodo nadgrajeni:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Naslednji paketi bodo POSTARANI:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Naslednji zadržani paketi bodo spremenjeni:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (zaradi %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
-"Tega NE storite, razen če ne veste natanko kaj počenjate!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu posodobljenih, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu postaranih, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Napaka med prevajanjem logičnega izraza - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Popravljanje odvisnosti ..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " spodletelo."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Ni mogoče popraviti odvisnosti"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Opravljeno"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nerešene odvisnosti. Poskusite uporabiti -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Ukaz update ne sprejema argumentov"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Preračunavanje nadgradnje ... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Notranja napaka zaradi AllUpgrade."
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Opravljeno"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"OPOMBA: To je samo simulacija!\n"
-"     apt-get za pravo izvajanje potrebuje privilegije skrbnika.\n"
-"     Zaklepanje je onemogočeno, zato se ne zanašajte\n"
-"     na pomembnost trenutnega pravega stanja!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Ni mogoče preimenovati %s v %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Zadetek "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Dobi:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Prezr "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Nap "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Pridobljenih %sB v %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Delo]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1655,19 +1690,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni mogoče brati %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ni mogoče spremeniti v %s"
@@ -1696,11 +1731,11 @@ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati"
 msgid "[Mirror: %s]"
 msgstr "[Zrcalni strežnik: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Povezava se je prezgodaj zaprla"
 
@@ -1741,1326 +1776,446 @@ msgstr "nad tem sporočilom. Popravite jih in poženite Namest[I]tev še enkrat"
 msgid "Merging available information"
 msgstr "Združevanje razpoložljivih podaktov"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Uporaba: apt-extracttemplates dat1 [dat2 ...]\n"
-"\n"
-"apt-extracttemplates je orodje za pridobivanje podatkov o\n"
-"nastavitvah in predlogah debianovih paketov\n"
-"\n"
-"Možnosti:\n"
-"  -h  To besedilo pomoči\n"
-"  -t   Nastavi začasno mapo\n"
-"  -c=? Prebere podano datoteko z nastavitvami\n"
-"  -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ni mogoče pisati na %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Seznam razširitev paketov je predolg"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Napaka med obdelavo mape %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Seznam razširitev virov je predolg"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Napaka med pisanjem glave v datoteko vsebine"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Napaka med obdelavo vsebine %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Uporaba: apt-ftparchive [možnosti] ukaz\n"
-"Ukazi: packages, binarypath [datoteka prepisa [predpona poti]]\n"
-"          sources srcpath [datoteka prepisa [predpona poti]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [skupine]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive ustvari datoteke kazala za arhive Debian. Podpira\n"
-"več slogov ustvarjanja od popolnoma samodejnih do funkcionalnih zamenjav\n"
-"za dpkg-scanpackages in dpkg-scansources\n"
-"\n"
-"apt-ftparchive ustvari datoteke paketov iz drevesa .debs. Datoteka\n"
-"paketa vsebuje vsebino vseh nadzornih polj iz vsakega paketa kot tudi\n"
-"razpršilo MD5 in velikost datoteke. Datoteka prepisa podpira vsiljenje\n"
-"vrednosti Prednosti in Odseka.\n"
-"\n"
-"Podobno apt-ftparchive ustvari datoteke paketov iz drevesa .dscs.\n"
-"Možnost --source-override je mogoče uporabiti za navedbo datoteke prepisa "
-"src\n"
-"\n"
-"Ukaza 'packages' in 'sources' je treba zagnati v korenu drevesa.\n"
-"BinaryPath bi morala kazati na osnovno mapo rekurzivnega iskanja in\n"
-"datoteka prepisa bi morala vsebovati zastavice prepisa Predpona je pripeta\n"
-"v polja imena datoteke, če je prisotna. Primer uporabe iz arhiva Debian:\n"
-"    apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"                 dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Možnosti:\n"
-"  -h    To besedilo pomoči\n"
-"  --md5 ustvarjanje nadzorne vsote MD5\n"
-"  -s=? datoteka prepisa vira\n"
-"  -q     tiho\n"
-"  -d=?  izbere izbirno podatkovno zbirko pomnilnika\n"
-"  --no-delink omogoči način razhroščevanja razvezovanja\n"
-"  --contents nadzira ustvarjanje datoteke vsebine\n"
-"  -c=? prebere to nastavitveno datoteko\n"
-"  -o=? nastavi poljubno možnost nastavitve"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Nobena izbira se ne ujema"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Podatkovna zbirka je pokvarjena, datoteka je preimenovana v %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "PZ je star, poskušanje nadgradnje %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejše "
-"različice apt, podatkovno zbirko odstranite in jo znova ustvarite."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ni mogoče odprti datoteke PZ %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Napaka med določitvijo %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Arhiv nima nadzornega zapisa"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Ni mogoče najti kazalke"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "O: ni mogoče brati mape %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "O: Ni mogoče določiti %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "O: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "N: Napake se sklicujejo na datoteko "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Ni mogoče razrešiti %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Hoja drevesa je spodletela"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Ni mogoče odprti %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " RazVeži %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Napaka med branjem povezave %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Napaka med odvezovanjem %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Napaka med povezovanjem %s in %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Dosežena meja RazVezovanja %sB.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Arhiv ni imel polja s paketom"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nima prepisanega vnosa\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Vzdrževalec %s je %s in ne %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nima izvornega vnosa prepisa\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nima tudi binarnega vnosa prepisa\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Napaka med dodeljevanjem pomnilnika"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Ni mogoče odpreti %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Napaka med branjem prepisane datoteke %s"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Neznan algoritem stiskanja '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Stisnjen izhod %s potrebuje niz stiskanja"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Ustvarjanje DATOTEKE* ni uspelo"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Vejitev ni uspela"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Podrejeni predmet stiskanja"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Notranja napaka. Ni mogoče ustvariti %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "VI podopravila/datoteke je spodletel"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Med računanjem MD5 ni mogoče brati"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Napaka med odvezovanjem %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Ni mogoče preimenovati %s v %s"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uporaba: apt-internal-solver\n"
-"\n"
-"apt-internal-solver je vmesnik za uporabo trenutnega notranjega\n"
-"reševalnika kot zunanji reševalnik za družino APT za razhroščevanje ali "
-"podobno.\n"
-"\n"
-"Možnosti:\n"
-"  -h To besedilo pomoči\n"
-"  -q Izhod se beleži - ni kazalnika napredka\n"
-"  -c=? Prebere to nastavitveno datoteko\n"
-"  -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Neznan zapis paketa!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Uporaba: apt-sortpkgs [možnosti] dat1 [dat2 ...]\n"
-"\n"
-"apt-sortpkgs je preprosto orodje za razvrščanje paketnih datotek. Možnost -"
-"s\n"
-"določa vrsto datoteke.\n"
-"\n"
-"Možnosti:\n"
-"  -h   to besedilo pomoči\n"
-"  -s   uporabi razvrščanje izvornih datotek\n"
-"  -c=? Prebere podano datoteko z nastavitvami\n"
-"  -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Ni mogoče ustvariti pip"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Ni mogoče izvesti gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Pokvarjen arhiv"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Neznana vrsta glave TAR %u, član %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Neveljaven podpis arhiva"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Napaka med branjem glave člana arhiva"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Neveljavna glava arhiva člana %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Neveljavna glava člana arhiva"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arhiv je prekratek"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Glav arhiva ni mogoče brati"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode je poklical stabilno povezano vozlišče"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Ni mogoče najti razpršenega elementa!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Ni mogoče dodeliti odklona"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Notranja napaka v AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Poskus prepisovanja odklona, %s -> %s in %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dvojni seštevek odklona %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Dvojnik datoteke z nastavitvami %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Zapisovanje datoteke %s je spodletelo"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Napaka med zapiranjem datoteke %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Pot %s je predolga"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Odpakiranje %s več kot enkrat"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Mapa %s je odklonjena"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Paket poskuša pisati v tarčo odklona %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Pot odklona je predloga"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Napaka med določitvijo %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Ni mogoče preimenovati %s v %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Mapa %s je bil zamenjana z ne-mapo"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Iskanje vozlišča v njegovem razpršenem vedru ni uspelo"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Pot je predolga"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Prepiši zadetek paketa brez vnosa različice za %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Ni mogoče določiti %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Zapisovanje datoteke %s je spodletelo"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Napaka med zapiranjem datoteke %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "To ni veljaven arhiv DEB. Manjka član '%s'."
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Notranja napaka. Ni mogoče najti člana %s."
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Nadzorne datoteke ni mogoče razčleniti"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "mmap prazne datoteke ni mogoč"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Ni mogoče podvojiti opisnika datotek %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Ni mogoče narediti mmap %llu bajtov"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Ni mogoče zapreti mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Ni mogoče uskladiti mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Ni mogoče narediti mmap %lu bajtov"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Ni mogoče obrezati datoteke"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Cache-Start. "
-"Trenutna vrednost: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Ni mogoče povečati velikosti MMap, ker je omejitev %lu bajtov že dosežena."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Ni mogoče povečati velikosti MMap, ker je samodejno povečevanje onemogočeno."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Izbire %s ni mogoče najti"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Neveljaven podpis arhiva"
 
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Neprepoznana vrsta okrajšave: '%c'"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Napaka med branjem glave člana arhiva"
 
-#: apt-pkg/contrib/configuration.cc:617
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Odpiranje nastavitvene datoteke %s"
+msgid "Invalid archive member header %s"
+msgstr "Neveljavna glava arhiva člana %s"
 
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Skladenjska napaka %s:%u: Blok se začne brez imena."
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Neveljavna glava člana arhiva"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Skladenjska napaka %s:%u: Slabo oblikovana oznaka."
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arhiv je prekratek"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Skladenjska napaka %s:%u: Dodatna krama za vrednostjo."
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Glav arhiva ni mogoče brati"
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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 vrhnji ravni."
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Ni mogoče ustvariti pip"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Skladenjska napaka %s:%u: Preveč vgnezdenih vključitev"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Ni mogoče izvesti gzip "
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Skladenjska napaka %s:%u: Vključeno od tu"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Pokvarjen arhiv"
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen"
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Skladenjska napaka %s:%u: počisti ukaz zahteva drevo možnosti kot argument"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Neznana vrsta glave TAR %u, član %s"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Skladenjska napaka %s:%u: Dodatna krama na koncu datoteke"
+msgid "Unable to stat %s."
+msgstr "Ni mogoče določiti %s."
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s ... Napaka!"
-
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s ... Narejeno"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s ... Narejeno"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Možnost ukazne vrstice '%c' [iz %s] ni poznana."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Možnosti ukazne vrstice %s ni mogoče razumeti"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Možnost ukazne vrstice %s ni boolova vrednost"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Možnost %s zahteva argument."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Možnost %s: Določilo predmeta nastavitve zahtevajo =<val>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Možnost %s zahteva celoštevilski argument, ne '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Možnost '%s' je predolga"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Pomena %s ni mogoče razumeti, poskusite pravilno ali napačno."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Neveljavno opravilo %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Ni mogoče določiti priklopne točke %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Ni mogoče določiti CD-ROM-a"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Težava med zapiranjem gzip datoteke %s"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko le za branje %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Ni mogoče odprti zaklenjene datoteke %s"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Poganjanje dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS"
+msgid "Packaging system '%s' is not supported"
+msgstr "Paketni sistem '%s' ni podprt"
 
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Ni mogoče zakleniti datoteke %s"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Ni mogoče določiti ustrezne vrste paketnega sistema"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Seznama datotek ni mogoče ustvariti, ker '%s' ni mapa"
+msgid "Wrote %i records.\n"
+msgstr "Zapisanih je bilo %i zapisov.\n"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Preziranje '%s' v mapi '%s', ker ni običajna datoteka"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "Preziranje datoteke '%s' v mapi '%s', ker nima pripone imena datotek"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"Preziranje datoteke '%s' v mapi '%s', ker nima veljavne pripone imena datotek"
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Pod-opravilo %s je prejelo segmentacijsko napako."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Pod-opravilo %s je prejelo signal %u."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Pod-opravilo %s se je nepričakovano zaključilo"
+"Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami in %i "
+"neujemajočimi datotekami.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open file %s"
-msgstr "Ni mogoče odpreti datoteke %s"
+msgid "Can't find authentication record for: %s"
+msgstr "Ni mogoče najti zapisa overitve za: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Ni mogoče odpreti opisnika datotek %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Ni mogoče ustvariti podopravila IPD"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Ni mogoče izvesti stiskanja "
+msgid "Hash mismatch for: %s"
+msgstr "Neujemanje razpršila za: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo"
+msgid "The method driver %s could not be found."
+msgstr "Gonilnika načinov %s ni mogoče najti."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "pisanje, preostalo je še %llu za pisanje, vendar ni bilo mogoče pisati"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "Težava med zapiranjem datoteke %s"
+msgid "Method %s did not start correctly"
+msgstr "Način %s se ni začel pravilno"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Težava med preimenovanje datoteke %s v %s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko."
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Težava med razvezovanjem datoteke %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Ni mogoče odprti ali razčleniti seznama paketov ali datoteke stanja."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Težava med usklajevanjem datoteke"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Za odpravljanje težav poskusite zagnati apt-get update."
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s ni nameščenih zbirk ključev."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Seznama virov ni mogoče brati."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Prazen predpomnilnik paketov"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Datoteka s predpomnilnikom paketov je pokvarjena"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Različica datoteke s predpomnilnikom paketov ni združljiva"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Datoteka predpomnilnika paketa je okvarjena. Je premajhna"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Predpomnilnik paketov je bil izgrajen za drugačno arhitekturo"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Odvisen od"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Predodvisen od"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Priporoča"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Priporoča"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "V sporu z"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Zamenja"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Zastara"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Pokvari"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Izboljša"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "pomembno"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "obvezno"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "običajni"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "izbirno"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "dodatno"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Gradnja drevesa odvisnosti"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Različice kandidatov"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Ustvarjanje odvisnosti"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Branje podatkov o stanju"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Odpiranje DatotekeStanja %s je spodletelo"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ni mogoče razčleniti datoteke paketa %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ni mogoče razčleniti datoteke paketa %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče "
-"razčleniti)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima "
-"vrednosti)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-"Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Odpiranje %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Vrstica %u v seznamu virov %s je predolga."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod "
-"APT::Immediate-Configure za podrobnosti. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Ni mogoče nastaviti '%s' "
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Ta krog namestitve zahteva začasno odstranitev ključnega paketa %s zaradi "
-"zanke spora/predodvisnosti. To je ponavadi slabo, toda če zares želite "
-"nadaljevati, vključite možnost APT::Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "Paket %s mora biti znova nameščen, vendar ni mogoče najti arhiva zanj."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda "
-"povzročili zadržani paketi."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Mapa seznama %spartial manjka."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Mapa arhivov %spartial manjka."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Mape %s ni mogoče zakleniti"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Pridobivanje datoteke %li od %li (%s preostalo)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Pridobivanje datoteke %li od %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Gonilnika načinov %s ni mogoče najti."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Način %s se ni začel pravilno"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko."
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Paketni sistem '%s' ni podprt"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Ni mogoče določiti ustrezne vrste paketnega sistema"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni mogoče določiti %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "V sources.list morate vstaviti URI-je z viri"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Ni mogoče odprti ali razčleniti seznama paketov ali datoteke stanja."
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Za odpravljanje težav poskusite zagnati apt-get update."
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Seznama virov ni mogoče brati."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"Vrednost '%s' je neveljavna za APT::Default-Release in zato takšna izdaja ni "
-"na voljo v virih"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Neveljaven zapis v datoteki možnosti %s, ni glave paketa"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Ni mogoče razumeti vrste bucike %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Prednost bucike ni navedena ali pa je nič."
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Predpomnilnik ima neustrezen sistem različic"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Čestitamo, presegli ste število imen paketov, ki jih zmore APT."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Čestitamo, presegli ste število različic, ki jih zmore APT."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Paketa %s %s ni bilo mogoče najti med obdelavo odvisnosti datotek"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Ni mogoče določiti seznama izvornih paketov %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Branje seznama paketov"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Zbiranje dobaviteljev datotek"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ni mogoče pisati na %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Pošlji scenarij reševalniku"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Pošlji zahtevo reševalniku"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Priprava za rešitev prejemanja"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Izvedi zunanji reševalnik"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "preimenovanje je spodletelo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Neujemanje vsote razpršil"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Neujemanje velikosti"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Neveljavno opravilo %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3069,16 +2224,16 @@ msgstr ""
 "Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos "
 "sources.list ali slabo oblikovana datoteka)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3087,12 +2242,12 @@ msgstr ""
 "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
 "skladišče ne bo uveljavljena."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3102,12 +2257,12 @@ msgstr ""
 "zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Napaka GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3116,12 +2271,12 @@ msgstr ""
 "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno "
 "popraviti ta paket (zaradi manjkajočega arhiva)."
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3129,71 +2284,134 @@ msgstr ""
 "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
 "%s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni mogoče razčleniti Release datoteke %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Ni izbir v Release datoteki %s"
+msgid "List directory %spartial is missing."
+msgstr "Mapa seznama %spartial manjka."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ni vnosa razpršila v Release datoteki %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Mapa arhivov %spartial manjka."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
+msgid "Unable to lock directory %s"
+msgstr "Mape %s ni mogoče zakleniti"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Pridobivanje datoteke %li od %li (%s preostalo)"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
+msgid "Retrieving file %li of %li"
+msgstr "Pridobivanje datoteke %li od %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile "
+"namesto njih uporabljene stare."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "V sources.list morate vstaviti URI-je z viri"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"Vrednost '%s' je neveljavna za APT::Default-Release in zato takšna izdaja ni "
+"na voljo v virih"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Neveljaven zapis v datoteki možnosti %s, ni glave paketa"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Ni mogoče razumeti vrste bucike %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Prednost bucike ni navedena ali pa je nič."
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod "
+"APT::Immediate-Configure za podrobnosti. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Ni mogoče nastaviti '%s' "
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Ta krog namestitve zahteva začasno odstranitev ključnega paketa %s zaradi "
+"zanke spora/predodvisnosti. To je ponavadi slabo, toda če zares želite "
+"nadaljevati, vključite možnost APT::Force-LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Vrstica %u v seznamu virov %s je predolga."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Odklapljanje CD-ROM-a ...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Uporabljanje CD-ROM-ove priklopne točke %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Odklapljanje CD-ROM-a\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Čakanje na disk ...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Priklapljanje CD-ROM-a ...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Identificiranje ... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Shranjena oznaka: %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Odklapljanje CD-ROM-a ...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "Preiskovanje diska za datoteke kazala ..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "Preiskovanje diska za datoteke kazala ...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3202,7 +2420,7 @@ msgstr ""
 "Najdenih je bilo %zu kazal paketov, %zu kazal virov, %zu kazalov prevodov in "
 "%zu podpisov\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3210,16 +2428,16 @@ msgstr ""
 "Nobenih datotek paketov ni mogoče najti, morda to ni disk Debian ali pa je "
 "arhitektura napačna?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Najdena je bila oznaka '%s'\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "To ni veljavno ime, poskusite znova.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3228,81 +2446,103 @@ msgstr ""
 "Ta disk se imenuje: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Kopiranje seznama paketov ..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Pisanje novega seznama virov\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Izvorni vnosi za ta disk so:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Zapisanih je bilo %i zapisov.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "Paket %s mora biti znova nameščen, vendar ni mogoče najti arhiva zanj."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda "
+"povzročili zadržani paketi."
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradnja drevesa odvisnosti"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Različice kandidatov"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ustvarjanje odvisnosti"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Branje podatkov o stanju"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n"
+msgid "Failed to open StateFile %s"
+msgstr "Odpiranje DatotekeStanja %s je spodletelo"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami in %i "
-"neujemajočimi datotekami.\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Ni mogoče najti zapisa overitve za: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Ni mogoče razčleniti datoteke paketa %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Neujemanje razpršila za: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Ni mogoče razčleniti datoteke paketa %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Izdaje '%s' za '%s' ni mogoče najti"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Različice '%s' za '%s' ni mogoče najti"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Ni mogoče najti naloge '%s'"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3311,173 +2551,242 @@ msgstr ""
 "Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa "
 "'%s', saj nima nobenega od njiju"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Ni mogoče izbrati najnovejše različice iz paketa '%s', saj je popolnoma "
 "navidezen"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "Ni mogoče izbrati nameščene različice iz paketa %s, saj ni nameščen"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Pošlji scenarij reševalniku"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ni mogoče razčleniti Release datoteke %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Pošlji zahtevo reševalniku"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Ni izbir v Release datoteki %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Priprava za rešitev prejemanja"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ni vnosa razpršila v Release datoteki %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Izvedi zunanji reševalnik"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče "
+"razčleniti)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Poganjanje dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile "
-"namesto njih uporabljene stare."
+"Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima "
+"vrednosti)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Odpiranje %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Nameščanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Odstranjevanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s je bil popolnoma odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s je izginil"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Poganjanje sprožilca po namestitvi %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mapa '%s' manjka"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Ni mogoče odpreti datoteke '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Razširjanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pripravljanje na nastavljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s je bil nameščen"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Pripravljanje na odstranitev %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s je bil odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Pripravljanje na popolno odstranitev %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s je bil popolnoma odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Ni mogoče pisati na %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "težave odvisnosti - puščanje nenastavljenega"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3485,7 +2794,7 @@ msgstr ""
 "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na "
 "navezujočo napako iz predhodne napake."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3493,7 +2802,7 @@ msgstr ""
 "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
 "polnega diska"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3501,7 +2810,7 @@ msgstr ""
 "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
 "zaradi pomanjkanja pomnilnika"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3509,14 +2818,14 @@ msgstr ""
 "Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo "
 "na krajevnem sistemu"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
 "dpkg V/I"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3524,23 +2833,750 @@ msgid ""
 msgstr ""
 "Skrbniške mape (%s) ni mogoče zakleniti. Jo morda uporablja drugo opravilo?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Skrbniške mape (%s) ni mogoče zakleniti. Ali ste skrbnik?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Ni zaklenjeno"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Izbire %s ni mogoče najti"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko le za branje %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Ni mogoče odprti zaklenjene datoteke %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Ni mogoče zakleniti datoteke %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "Seznama datotek ni mogoče ustvariti, ker '%s' ni mapa"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "Preziranje '%s' v mapi '%s', ker ni običajna datoteka"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr "Preziranje datoteke '%s' v mapi '%s', ker nima pripone imena datotek"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"Preziranje datoteke '%s' v mapi '%s', ker nima veljavne pripone imena datotek"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Pod-opravilo %s je prejelo segmentacijsko napako."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Pod-opravilo %s je prejelo signal %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Pod-opravilo %s se je nepričakovano zaključilo"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Težava med zapiranjem gzip datoteke %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Ni mogoče odpreti datoteke %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Ni mogoče odpreti opisnika datotek %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Ni mogoče ustvariti podopravila IPD"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Ni mogoče izvesti stiskanja "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "pisanje, preostalo je še %llu za pisanje, vendar ni bilo mogoče pisati"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Težava med zapiranjem datoteke %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Težava med preimenovanje datoteke %s v %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Težava med razvezovanjem datoteke %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Težava med usklajevanjem datoteke"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s ... Napaka!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s ... Narejeno"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s ... Narejeno"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "mmap prazne datoteke ni mogoč"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Ni mogoče podvojiti opisnika datotek %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Ni mogoče narediti mmap %llu bajtov"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Ni mogoče zapreti mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Ni mogoče uskladiti mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Ni mogoče narediti mmap %lu bajtov"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Ni mogoče obrezati datoteke"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Cache-Start. "
+"Trenutna vrednost: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Ni mogoče povečati velikosti MMap, ker je omejitev %lu bajtov že dosežena."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Ni mogoče povečati velikosti MMap, ker je samodejno povečevanje onemogočeno."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Ni mogoče določiti priklopne točke %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Ni mogoče določiti CD-ROM-a"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Neprepoznana vrsta okrajšave: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Odpiranje nastavitvene datoteke %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Skladenjska napaka %s:%u: Slabo oblikovana oznaka."
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Skladenjska napaka %s:%u: Dodatna krama za vrednostjo."
+
+#: apt-pkg/contrib/configuration.cc:877
+#, 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 vrhnji ravni."
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Skladenjska napaka %s:%u: Preveč vgnezdenih vključitev"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Skladenjska napaka %s:%u: Vključeno od tu"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Skladenjska napaka %s:%u: počisti ukaz zahteva drevo možnosti kot argument"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Skladenjska napaka %s:%u: Dodatna krama na koncu datoteke"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s ni nameščenih zbirk ključev."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Možnost ukazne vrstice '%c' [iz %s] ni poznana."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Možnosti ukazne vrstice %s ni mogoče razumeti"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Možnost ukazne vrstice %s ni boolova vrednost"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Možnost %s zahteva argument."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Možnost %s: Določilo predmeta nastavitve zahtevajo =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Možnost %s zahteva celoštevilski argument, ne '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Možnost '%s' je predolga"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Pomena %s ni mogoče razumeti, poskusite pravilno ali napačno."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Neveljavno opravilo %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Uporaba: apt-extracttemplates dat1 [dat2 ...]\n"
+"\n"
+"apt-extracttemplates je orodje za pridobivanje podatkov o\n"
+"nastavitvah in predlogah debianovih paketov\n"
+"\n"
+"Možnosti:\n"
+"  -h  To besedilo pomoči\n"
+"  -t   Nastavi začasno mapo\n"
+"  -c=? Prebere podano datoteko z nastavitvami\n"
+"  -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ni mogoče določiti %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Seznam razširitev paketov je predolg"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Napaka med obdelavo mape %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Seznam razširitev virov je predolg"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Napaka med pisanjem glave v datoteko vsebine"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Napaka med obdelavo vsebine %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Uporaba: apt-ftparchive [možnosti] ukaz\n"
+"Ukazi: packages, binarypath [datoteka prepisa [predpona poti]]\n"
+"          sources srcpath [datoteka prepisa [predpona poti]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [skupine]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive ustvari datoteke kazala za arhive Debian. Podpira\n"
+"več slogov ustvarjanja od popolnoma samodejnih do funkcionalnih zamenjav\n"
+"za dpkg-scanpackages in dpkg-scansources\n"
+"\n"
+"apt-ftparchive ustvari datoteke paketov iz drevesa .debs. Datoteka\n"
+"paketa vsebuje vsebino vseh nadzornih polj iz vsakega paketa kot tudi\n"
+"razpršilo MD5 in velikost datoteke. Datoteka prepisa podpira vsiljenje\n"
+"vrednosti Prednosti in Odseka.\n"
+"\n"
+"Podobno apt-ftparchive ustvari datoteke paketov iz drevesa .dscs.\n"
+"Možnost --source-override je mogoče uporabiti za navedbo datoteke prepisa "
+"src\n"
+"\n"
+"Ukaza 'packages' in 'sources' je treba zagnati v korenu drevesa.\n"
+"BinaryPath bi morala kazati na osnovno mapo rekurzivnega iskanja in\n"
+"datoteka prepisa bi morala vsebovati zastavice prepisa Predpona je pripeta\n"
+"v polja imena datoteke, če je prisotna. Primer uporabe iz arhiva Debian:\n"
+"    apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"                 dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Možnosti:\n"
+"  -h    To besedilo pomoči\n"
+"  --md5 ustvarjanje nadzorne vsote MD5\n"
+"  -s=? datoteka prepisa vira\n"
+"  -q     tiho\n"
+"  -d=?  izbere izbirno podatkovno zbirko pomnilnika\n"
+"  --no-delink omogoči način razhroščevanja razvezovanja\n"
+"  --contents nadzira ustvarjanje datoteke vsebine\n"
+"  -c=? prebere to nastavitveno datoteko\n"
+"  -o=? nastavi poljubno možnost nastavitve"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Nobena izbira se ne ujema"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Podatkovna zbirka je pokvarjena, datoteka je preimenovana v %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "PZ je star, poskušanje nadgradnje %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejše "
+"različice apt, podatkovno zbirko odstranite in jo znova ustvarite."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ni mogoče odprti datoteke PZ %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Arhiv nima nadzornega zapisa"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Ni mogoče najti kazalke"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "O: ni mogoče brati mape %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "O: Ni mogoče določiti %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "O: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "N: Napake se sklicujejo na datoteko "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Ni mogoče razrešiti %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Hoja drevesa je spodletela"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Ni mogoče odprti %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " RazVeži %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Napaka med branjem povezave %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Napaka med odvezovanjem %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Napaka med povezovanjem %s in %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Dosežena meja RazVezovanja %sB.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Arhiv ni imel polja s paketom"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s nima prepisanega vnosa\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  Vzdrževalec %s je %s in ne %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s nima izvornega vnosa prepisa\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s nima tudi binarnega vnosa prepisa\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Napaka med dodeljevanjem pomnilnika"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ni mogoče odpreti %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Napaka med branjem prepisane datoteke %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Neznan algoritem stiskanja '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Stisnjen izhod %s potrebuje niz stiskanja"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Ustvarjanje DATOTEKE* ni uspelo"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Vejitev ni uspela"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Podrejeni predmet stiskanja"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Notranja napaka. Ni mogoče ustvariti %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "VI podopravila/datoteke je spodletel"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Med računanjem MD5 ni mogoče brati"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Napaka med odvezovanjem %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uporaba: apt-internal-solver\n"
+"\n"
+"apt-internal-solver je vmesnik za uporabo trenutnega notranjega\n"
+"reševalnika kot zunanji reševalnik za družino APT za razhroščevanje ali "
+"podobno.\n"
+"\n"
+"Možnosti:\n"
+"  -h To besedilo pomoči\n"
+"  -q Izhod se beleži - ni kazalnika napredka\n"
+"  -c=? Prebere to nastavitveno datoteko\n"
+"  -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Neznan zapis paketa!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Uporaba: apt-sortpkgs [možnosti] dat1 [dat2 ...]\n"
+"\n"
+"apt-sortpkgs je preprosto orodje za razvrščanje paketnih datotek. Možnost -"
+"s\n"
+"določa vrsto datoteke.\n"
+"\n"
+"Možnosti:\n"
+"  -h   to besedilo pomoči\n"
+"  -s   uporabi razvrščanje izvornih datotek\n"
+"  -c=? Prebere podano datoteko z nastavitvami\n"
+"  -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s ni veljaven paket DEB."
 
diff --git a/po/sv.po b/po/sv.po
index 7a0beb545..111b41019 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2010-08-24 21:18+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -19,153 +19,154 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 "Paketet %s med version %s har ett beroende som inte kan tillfredsställas:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Totalt antal paketnamn: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Totala paketstrukturer: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Vanliga paket: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Helt virtuella paket: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Enstaka virtuella paket: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Blandade virtuella paket: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Saknade: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Totalt antal olika versioner: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Totalt antal olika beskrivningar: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Totalt antal beroenden: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Totalt antal version/filrelationer: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Totalt antal beskrivning/filrelationer: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Totalt antal tillhandahållningsmarkeringar: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Totalt antal sökmönstersträngar: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Totalt utrymme för versionsberoenden: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Totalt bortkastat utrymme: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Totalt utrymme som kan redogöras för: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Paketfilen %s är inte synkroniserad."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Inga paket hittades"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Du måste ange minst ett sökmönster"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kunde inte hitta paketet %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "\"Package\"-filer:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cachen är inte synkroniserad, kan inte korsreferera en paketfil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Fastnålade paket:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(hittades inte)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Installerad: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Paketnålning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Versionstabell:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -239,28 +240,28 @@ msgstr ""
 "  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
 "Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 5.0.3 Disk 1\""
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Mata in en skiva i enheten och tryck på Enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Misslyckades med att montera \"%s\" till \"%s\""
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Upprepa proceduren för resten av cd-skivorna i din uppsättning."
 
@@ -296,65 +297,65 @@ msgstr ""
 "  -c=? Läs denna konfigurationsfil.\n"
 "  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Väljer \"%s\" som källkodspaket istället för \"%s\"\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Ignorera otillgängliga versionen \"%s\" av paketet \"%s\""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunde inte hitta paketet %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s är satt till manuellt installerad.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s är satt till automatiskt installerad.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internt fel, problemlösaren förstörde någonting"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Kunde inte låsa hämtningskatalogen"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunde inte hitta något källkodspaket för %s"
@@ -380,95 +381,95 @@ msgstr ""
 "bzr get %s\n"
 "för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar över redan hämtade filen \"%s\"\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunde inte fastställa ledigt utrymme i %s"
 
-#: cmdline/apt-get.cc:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Behöver hämta %sB källkodsarkiv.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hämtar källkoden %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Misslyckades med att hämta vissa arkiv."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggkommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Barnprocessen misslyckades"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har inga byggberoenden.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -477,7 +478,7 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -486,14 +487,14 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -502,7 +503,7 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
 "versioner av paketet %s tillfredsställer versionskraven"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -511,31 +512,31 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggberoenden för %s kunde inte tillfredsställas."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Misslyckades med att behandla byggberoenden"
 
 # Felmeddelande för misslyckad chdir
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Ansluter till %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Moduler som stöds:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -623,53 +624,74 @@ msgstr ""
 "för mer information och flaggor.\n"
 "                     Denna APT har Speciella Ko-Krafter.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Du måste ange minst ett paket att hämta källkod för"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "men det är inte installerat"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s är satt till manuellt installerad.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s är satt till automatiskt installerad.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s är redan den senaste versionen.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s är redan den senaste versionen.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Väntade på %s men den fanns inte där"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s är satt till manuellt installerad.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Misslyckades med att öppna %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -696,7 +718,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -744,52 +766,52 @@ msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används."
 msgid "Disk not found."
 msgstr "Skivan hittades inte."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Filen hittades inte"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Kunde inte ta status"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Misslyckades ställa in ändringstid"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ogiltig URI, lokala URI:er får inte börja med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Loggar in"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Kunde inte fastställa namnet på partnern"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Kunde inte fastställa det lokala namnet"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Servern nekade anslutningen och sade: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -797,122 +819,124 @@ msgstr ""
 "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::"
 "ProxyLogin är tom."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Kommandot \"%s\" i inloggningsskriptet misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Tidsgränsen för anslutningen överskreds"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Servern stängde anslutningen"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Läsfel"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Ett svar spillde bufferten."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Protokollet skadat"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Skrivfel"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Kunde inte skapa ett uttag (socket)"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Kunde inte ansluta passivt uttag (socket)."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo kunde inte få tag i ett lyssnande uttag (socket)"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Kunde inte binda ett uttag (socket)"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Kunde inte lyssna på uttaget (socket)"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Kunde inte fastställa uttagets namn (socket)"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Kunde inte sända PORT-kommando"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Okänd adressfamilj %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Kunde inte ta emot anslutningen"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problem med att lägga filen till hashtabellen"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kunde inte hämta filen, servern sade \"%s\""
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Datauttag (socket) fick inte svar inom tidsgränsen"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataöverföringen misslyckades, servern sade \"%s\""
 
 # Statusmeddelande, byter från substantiv till verb
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Frågar"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Kunde inte starta "
 
@@ -950,7 +974,7 @@ msgstr "Kunde inte ansluta till %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Ansluter till %s"
@@ -982,39 +1006,39 @@ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Kunde inte ansluta till %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ogiltig signatur träffades på."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kunde inte köra \"gpgv\" för att verifiera signatur (är gpgv installerad?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Okänt fel vid körning av gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Följande signaturer är ogiltiga:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1022,117 +1046,351 @@ msgstr ""
 "Följande signaturer kunde inte verifieras för att den öppna nyckeln inte är "
 "tillgänglig:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Fel vid skrivning till filen"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 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:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Fel vid läsning från server"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "\"Select\" misslyckades"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Anslutningen överskred tidsgränsen"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Fel vid skrivning till utdatafil"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Väntar på rubriker"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Felaktig rubrikrad"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-servern sände ett ogiltigt svarshuvud"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http-servern sände ett ogiltigt Content-Length-rubrik"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-servern sände ett ogiltigt Content-Range-rubrik"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Okänt datumformat"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Felaktiga data i huvud"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Beräknar uppgradering... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Internt fel, AllUpgrade förstörde något"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Färdig"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Korrigerar beroenden..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " misslyckades."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Kunde inte korrigera beroenden"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunde inte minimera uppgraderingsuppsättningen"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Färdig"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Otillfredsställda beroenden. Prova med -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installerat]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installerat]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installerat]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installerat]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s är installerat"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s kommer att installeras"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "men det kan inte installeras"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "men det är ett virtuellt paket"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "men det är inte installerat"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "men det kommer inte att installeras"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Följande NYA paket kommer att installeras:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Följande paket kommer att TAS BORT:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Följande paket har hållits tillbaka:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Följande paket kommer att uppgraderas:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Följande paket kommer att NEDGRADERAS:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Följande tillbakahållna paket kommer att ändras:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (på grund av %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu att uppgradera, %lu att nyinstallera, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu att installera om, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu att nedgradera, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu är inte helt installerade eller borttagna.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Fel vid kompilering av reguljärt uttryck - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Uppdateringskommandot tar inga argument"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internt fel. Sorteringen färdigställdes inte"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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."
+"Konstigt... storlekarna stämde inte överens, skicka e-post till apt@packages."
 "debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Behöver hämta %sB/%sB arkiv.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Behöver hämta %sB arkiv.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1140,31 +1398,31 @@ msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Problem har uppstått och -y användes utan --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Ja, gör som jag säger!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1176,19 +1434,19 @@ msgstr ""
 " ?] "
 
 # Visas då man svarar nej
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Avbryter."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Vill du fortsätta?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Misslyckades med att hämta vissa filer"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1196,19 +1454,19 @@ msgstr ""
 "Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --"
 "fix-missing."
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing och mediabyte stöds inte för tillfället"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Kunde inte korrigera saknade paket."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Avbryter installationen."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1222,16 +1480,16 @@ msgstr[1] ""
 "Följande paket har försvunnit från ditt system eftersom\n"
 "alla filer har skrivits över av andra paket:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Observera: Detta sker med automatik och vid behov av dpkg."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 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"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1249,15 +1507,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 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:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internt fel, AutoRemover förstörde något"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1268,7 +1526,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Följande paket har installerats automatiskt och är inte längre nödvändiga:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1278,18 +1536,18 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Använd \"apt-get autoremove\" för att ta bort dem."
 msgstr[1] "Använd \"apt-get autoremove\" för att ta bort dem."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1297,7 +1555,7 @@ msgstr ""
 "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
 "(eller ange en lösning)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1309,327 +1567,101 @@ msgstr ""
 "att några nödvändiga paket ännu inte har skapats eller flyttats\n"
 "ut från \"Incoming\"."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Trasiga paket"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Följande ytterligare paket kommer att installeras:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Föreslagna paket:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Rekommenderade paket:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"OBSERVERA: Detta är endast en simulation!\n"
+"           apt-get behöver root-privilegier för verklig körning.\n"
+"           Tänk också på att låsningen är inaktiverad, så\n"
+"           förlita dig inte på relevansen till den verkliga situationen!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VARNING: Följande paket kunde inte autentiseras!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Autentiseringsvarning åsidosatt.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Några av paketen kunde inte autentiseras"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Installera dessa paket utan verifiering?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Misslyckades med att hämta %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installerat]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installerat]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installerat]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installerat]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s är installerat"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s kommer att installeras"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "men det kan inte installeras"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "men det är ett virtuellt paket"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "men det är inte installerat"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "men det kommer inte att installeras"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Följande NYA paket kommer att installeras:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Följande paket kommer att TAS BORT:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Följande paket har hållits tillbaka:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Följande paket kommer att uppgraderas:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Följande paket kommer att NEDGRADERAS:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Följande tillbakahållna paket kommer att ändras:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (på grund av %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu att uppgradera, %lu att nyinstallera, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu att installera om, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu att nedgradera, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu är inte helt installerade eller borttagna.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Fel vid kompilering av reguljärt uttryck - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Korrigerar beroenden...."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " misslyckades."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Kunde inte korrigera beroenden"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunde inte minimera uppgraderingsuppsättningen"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Färdig"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Otillfredsställda beroenden. Prova med -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Uppdateringskommandot tar inga argument"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Beräknar uppgradering... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Internt fel, AllUpgrade förstörde något"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Färdig"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"OBSERVERA: Detta är endast en simulation!\n"
-"           apt-get behöver root-privilegier för verklig körning.\n"
-"           Tänk också på att låsningen är inaktiverad, så\n"
-"           förlita dig inte på relevansen till den verkliga situationen!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Misslyckades med att byta namn på %s till %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
 # Måste vara tre bokstäver(?)
 # "Hit" = aktuell version är fortfarande giltig
-#: apt-private/acqprogress.cc:63
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Bra "
 
 # "Get:" = hämtar ny version
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Läs:"
 
 # "Ign" = hoppar över
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ign "
 
 # "Err" = fel vid hämtning
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Fel "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Hämtade %sB på %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Arbetar]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1642,20 +1674,20 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunde inte läsa %s"
 
 # Felmeddelande för misslyckad chdir
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kunde inte byta till %s"
@@ -1684,11 +1716,11 @@ msgstr "Ingen spegelfil \"%s\" hittades "
 msgid "[Mirror: %s]"
 msgstr "[Spegel: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Misslyckades med att skapa IPC-rör till underprocess"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Anslutningen stängdes i förtid"
 
@@ -1730,1363 +1762,480 @@ msgstr "meddelandet är viktiga. Försök korrigera dem och kör [I]nstallera ig
 msgid "Merging available information"
 msgstr "Sammanfogar tillgänglig information"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Användning: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n"
-"och mallinformation från paket\n"
-"\n"
-"Flaggor:\n"
-"  -h   Denna hjälptext.\n"
-"  -t   Ställ in temporärkatalogen.\n"
-"  -c=? Läs denna konfigurationsfil.\n"
-"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kunde inte skriva till %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Listan över filtillägg för Packages är för lång"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Fel vid behandling av katalogen %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Listan över filtillägg för Sources är för lång"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Fel vid skrivning av rubrik till innehållsfil"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Fel vid behandling av innehållet %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Användning: apt-ftparchive [flaggor] kommando\n"
-"Kommandon: packages binärsökväg [åsidosättningsfil [sökvägsprefix]]\n"
-"           sources källsökväg [åsidosättningsfil [sökvägsprefix]]\n"
-"           contents sökväg\n"
-"           release sökväg\n"
-"           generate konfiguration [grupper]\n"
-"           clean konfiguration\n"
-"\n"
-"apt-ftparchive genererar indexfiler för Debianarkiv. Det stöder många\n"
-"former av generering, allt från helautomatiserat till funktionella\n"
-"ersättningar till dpkg-scanpackages och dpkg-scansources\n"
-"\n"
-"apt-ftparchive skapar Package-filer från ett träd med .deb-filer.\n"
-"Packagefilen innehåller alla styrfälten från paketen samt MD5-hashvärdet\n"
-"och filstorlek. En overrride-fil stöds för att tvinga värden på Priority\n"
-"och Section.\n"
-"\n"
-"På samma sätt skapar apt-ftparchive Sources-filer från ett träd med\n"
-".dsc-filer. Flaggan --source-override kan användas för att ange en\n"
-"override-fil för källkoden.\n"
-"\n"
-"Kommandona \"packages\" och \"sources\" bör köras från rotet på trädet.\n"
-"Binärsökvägen bör peka på basen på den rekursiva sökningen och\n"
-"override-filen bör innehålla override-flaggorna de framtvingade flaggorna.\n"
-"Sökvägsprefixet läggs till i filnamnsfälten om det anges. Ett exempel på\n"
-"hur programmet kan användas från Debianarkivet:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Flaggor:\n"
-"  -h    Denna hjälptext\n"
-"  --md5 Kontrollera generering av MD5\n"
-"  -s=?  Källkods-override-fil\n"
-"  -q    Tyst\n"
-"  -d=?  Väljer den valfria cachedatabasen\n"
-"  --no-delink Aktivera \"delinkning\"-felsökningsläget\n"
-"  --contents  Styr skapande av contents-fil\n"
-"  -c=?  Läs denna konfigurationsfil\n"
-"  -o=?  Ställ in en godtycklig konfigurationsflagga"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Inga val träffades"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Några filer saknas i paketfilsgruppen \"%s\""
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB var skadad, filen omdöpt till %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB är gammal, försöker uppgradera %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar "
-"från en äldre version av apt."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Kunde inte öppna DB-filen %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Misslyckades med att ta status på %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Arkivet har ingen styrpost"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Kunde inte få tag i någon markör"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "V: Kunde inte läsa katalogen %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "V: Kunde inte ta status på %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "F: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "V: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "F: Felen gäller filen "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Misslyckades med att slå upp %s"
-
-# ???
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Trädvandring misslyckades"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Misslyckades med att öppna %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Avlänka %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Misslyckades med att läsa länken %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Misslyckades med att länka ut %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Misslyckades med att länka %s till %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Avlänkningsgränsen på %sB nåddes.\n"
-
-# Fält vid namn "Package"
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Arkivet har inget package-fält"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har ingen post i override-filen\n"
-
-# parametrar: paket, ny, gammal
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  ansvarig för paketet %s är %s ej %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har ingen källåsidosättningspost\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s har heller ingen binär åsidosättningspost\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Misslyckades med att allokera minne"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Kunde inte öppna %s"
-
-# parametrar: filnamn, radnummer
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Felaktig override %s rad %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Misslyckades med att läsa åsidosättningsfilen %s"
-
-# parametrar: filnamn, radnummer
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Felaktig override %s rad %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Felaktig override %s rad %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Felaktig override %s rad %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Okänd komprimeringsalgoritm \"%s\""
-
-# ???
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Misslyckades med att skapa FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Misslyckades med att grena process"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Barnprocess för komprimering"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Internt fel, misslyckades med att skapa %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "In/ut för underprocess/fil misslyckades"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Misslyckades med att läsa vid beräkning av MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem med att länka ut %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Misslyckades med att byta namn på %s till %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Användning: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n"
-"och mallinformation från paket\n"
-"\n"
-"Flaggor:\n"
-"  -h   Denna hjälptext.\n"
-"  -t   Ställ in temporärkatalogen.\n"
-"  -c=? Läs denna konfigurationsfil.\n"
-"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Okänd paketpost!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Användning: apt-sortpkgs [flaggor] fil1 [fil2 ...]\n"
-"\n"
-"apt-sortpkgs är ett enkelt verktyg för att sortera paketfiler. Flaggan\n"
-"-s anges för att ange filens typ.\n"
-"\n"
-"Flaggor:\n"
-"  -h   Denna hjälptext.\n"
-"  -s   Använd källkodsfilssortering.\n"
-"  -c=? Läs denna konfigurationsfil.\n"
-"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Misslyckades med att skapa rör"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Misslyckades med att köra gzip"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Skadat arkiv"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-kontrollsumma misslyckades, arkivet skadat"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Okänd TAR-rubriktyp %u, del %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Ogiltig arkivsignatur"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Fel vid läsning av rubrik för arkivdel"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ogiltig arkivdelsrubrik %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Ogiltigt arkivdelsrubrik"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arkivet är för kort"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Misslyckades med att läsa arkivrubriker"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode anropat på fortfarande länkad nod"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Misslyckades med att hitta hash-elementet!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Misslyckades med att allokera omdirigering"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Internt fel i AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Försöker att skriva över en omdirigering, %s -> %s och %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Omdirigeringen %s -> %s inlagd två gånger"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Duplicerad konfigurationsfil %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Misslyckades med att skriva filen %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Misslyckades med att stänga filen %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Sökvägen %s är för lång"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Packar upp %s flera gånger"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Katalogen %s är omdirigerad"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Paketet försöker att skriva till omdirigeringsmålet %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Omdirigeringssökvägen är för lång"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Misslyckades med att ta status på %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Misslyckades med att byta namn på %s till %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Katalogen %s ersätts av en icke-katalog"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Misslyckades med att hitta noden i sin hashkorg"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Sökvägen är för lång"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Skriv över paketträff utan version för %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Kunde inte ta status på %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Misslyckades med att skriva filen %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Misslyckades med att stänga filen %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Internt fel, kunde inta hitta delen %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Kunde inte tolka control-filen"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Kan inte utföra mmap på en tom fil"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Kunde inte duplicera filhandtag %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Kunde inte utföra mmap på %lu byte"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Kunde inte stänga mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Kunde inte synkronisera mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Kunde inte utföra mmap på %lu byte"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Misslyckades med att kapa av filen"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Start. "
-"Aktuellt värde: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Kunde inte öka storleken för MMap eftersom gränsen på %lu byte redan har "
-"uppnåtts."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Kunde inte öka storleken för MMap eftersom automatisk växt har inaktiverats "
-"av användaren."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Valet %s hittades inte"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Okänd typförkortning: \"%c\""
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Öppnar konfigurationsfilen %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, 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:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaxfel %s:%u: Felformat märke"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, 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:861
-#, 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:868
-#, 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:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaxfel %s:%u: Inkluderad härifrån"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ogiltig arkivsignatur"
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Fel vid läsning av rubrik för arkivdel"
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "Syntaxfel %s:%u: clear-direktivet kräver ett flaggträd som argument"
+msgid "Invalid archive member header %s"
+msgstr "Ogiltig arkivdelsrubrik %s"
 
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ogiltigt arkivdelsrubrik"
 
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Fel!"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arkivet är för kort"
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Färdig"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Misslyckades med att läsa arkivrubriker"
 
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Misslyckades med att skapa rör"
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Färdig"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Misslyckades med att köra gzip"
 
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Kommandoradsflaggan \"%c\" [från %s] är inte känd."
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Skadat arkiv"
 
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Förstår inte kommandoradsflaggan %s"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar-kontrollsumma misslyckades, arkivet skadat"
 
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Kommandoradsflaggan %s är inte boolsk"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Okänd TAR-rubriktyp %u, del %s"
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Flaggan %s kräver ett argument."
+msgid "Unable to stat %s."
+msgstr "Kunde inte ta status på %s."
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Flaggan %s: Den angivna konfigurationsposten måste innehålla ett =<värde>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Flaggan %s kräver ett heltalsargument, inte \"%s\""
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Flaggan \"%s\" är för lång"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Förstår inte %s, prova med \"true\" eller \"false\"."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Felaktig åtgärd %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Kunde inte ta status på monteringspunkten %s."
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Kunde inte ta status på cd-romen."
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problem med att stänga gzip-filen %s"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Använder inte låsning för skrivskyddade låsfilen %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Kunde inte öppna låsfilen %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Använder inte låsning för nfs-monterade låsfilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Kunde inte erhålla låset %s"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Kör dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgid "Packaging system '%s' is not supported"
+msgstr "Paketsystemet \"%s\" stöds inte"
 
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+#
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Kunde inte fastställa en lämplig paketsystemstyp"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgid "Wrote %i records.\n"
+msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Underprocessen %s råkade ut för ett segmenteringsfel."
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Skrev %i poster med %i saknade filer.\n"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Underprocessen %s tog emot signal %u."
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Skrev %i poster med %i filer som inte stämmer\n"
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Underprocessen %s svarade med en felkod (%u)"
+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"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Underprocessen %s avslutades oväntat"
+msgid "Can't find authentication record for: %s"
+msgstr "Kan inte hitta autentiseringspost för: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file %s"
-msgstr "Kunde inte öppna filen %s"
+msgid "Hash mismatch for: %s"
+msgstr "Hash-kontrollsumman stämmer inte för: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Kunde inte öppna filhandtag %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Misslyckades med att skapa underprocess-IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Misslyckades med att starta komprimerare "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar"
+msgid "The method driver %s could not be found."
+msgstr "Metoddrivrutinen %s kunde inte hittas."
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
+msgid "Is the package %s installed?"
+msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "Problem med att stänga filen %s"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startade inte korrekt"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problem med att byta namn på filen %s till %s"
+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/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problem med att avlänka filen %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Paketlistan eller statusfilen kunde inte tolkas eller öppnas."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problem med att synkronisera filen"
+#: apt-pkg/cachefile.cc:98
+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\""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nyckelring installerad i %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Listan över källor kunde inte läsas."
 
 # Felmeddelande
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Paketcachen är tom"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Paketcachefilen är skadad"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Paketcachefilens version är inkompatibel"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Paketcachefilen är skadad"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Paketcachen byggdes för en annan arkitektur"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Beroende av"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Förberoende av"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Föreslår"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Rekommenderar"
 
 # "Konfliktar"?
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Står i konflikt med"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Ersätter"
 
 # "Föråldrar"?
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Föråldrar"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Gör sönder"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Utökar"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "viktigt"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "nödvändigt"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Bygger beroendeträd"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Kandiderande versioner"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Beroendegenerering"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Läser tillståndsinformation"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Misslyckades med att öppna StateFile %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Misslyckades med att skriva temporär StateFile %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Kunde inte tolka paketfilen %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Kunde inte tolka paketfilen %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Rad %lu i källistan %s har fel format ([option] för kort)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Rad %lu i källistan %s har  (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Rad %lu i källistan %s har fel format (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Rad %lu i källistan %s har fel format (Absolut dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Öppnar %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Rad %u är för lång i källistan %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Rad %u i källistan %s har fel format (typ)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Kunde inte genomföra omedelbar konfiguration på \"%s\". Se man 5 apt.conf "
-"under APT::Immediate-Configure för information. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Kunde inte öppna filen \"%s\""
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"För att genomföra installationen måste det systemkritiska paketet %s "
-"tillfälligt tas bort på grund av en beroendespiral i Conflicts/Pre-Depends. "
-"Detta är oftast en dålig idé, men om du verkligen vill göra det kan du "
-"aktivera flaggan \"APT::Force-LoopBreak\"."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indexfiler av typ \"%s\" stöds inte"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på "
-"tillbakahållna paket."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Listkatalogen %spartial saknas."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arkivkatalogen %spartial saknas."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Kunde inte låsa katalogen %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Hämtar fil %li av %li (%s återstår)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Hämtar fil %li av %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metoddrivrutinen %s kunde inte hittas."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startade inte korrekt"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Paketsystemet \"%s\" stöds inte"
-
-#
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Kunde inte fastställa en lämplig paketsystemstyp"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunde inte ta status på %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Du måste lägga till några \"source\"-URI:er i din sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Paketlistan eller statusfilen kunde inte tolkas eller öppnas."
-
-#: apt-pkg/cachefile.cc:91
-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\""
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Listan över källor kunde inte läsas."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-# "Package" är en sträng i konfigurationsfilen
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Ogiltig post i konfigurationsfilen %s, \"Package\"-rubriken saknas"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Förstod inte nåltypen %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Prioritet ej angiven (eller noll) för nål"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Cachen har ett inkompatibelt versionssystem"
 
 # NewPackage etc. är funktionsnamn
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Fel uppstod vid hantering av %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Grattis, du överskred antalet paketnamn som denna APT kan hantera."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Grattis, du överskred antalet versioner som denna APT kan hantera."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Grattis, du överskred antalet beskrivningar som denna APT kan hantera."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Paketet %s %s hittades inte när filberoenden hanterades"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kunde inte ta status på källkodspaketlistan %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Läser paketlistor"
 
 # Bättre ord?
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Samlar filtillhandahållningar"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kunde inte skriva till %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "In-/utfel vid lagring av källcache"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "namnbyte misslyckades, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Hash-kontrollsumman stämmer inte"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Storleken stämmer inte"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Felaktig åtgärd %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Kunde inte tolka \"Release\"-filen %s"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3097,12 +2246,12 @@ msgstr ""
 "%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fel: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3111,82 +2260,146 @@ msgstr ""
 "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
 "manuellt måste reparera detta paket (på grund av saknad arkitektur)."
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kunde inte tolka \"Release\"-filen %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Leverantörsblocket %s saknar fingeravtryck"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Inga sektioner i Release-filen %s"
+msgid "List directory %spartial is missing."
+msgstr "Listkatalogen %spartial saknas."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ingen Hash-post i Release-filen %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Arkivkatalogen %spartial saknas."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
+msgid "Unable to lock directory %s"
+msgstr "Kunde inte låsa katalogen %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ogiltig \"Date\"-post i Release-filen %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Hämtar fil %li av %li (%s återstår)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Leverantörsblocket %s saknar fingeravtryck"
+msgid "Retrieving file %li of %li"
+msgstr "Hämtar fil %li av %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla "
+"använts istället."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Du måste lägga till några \"source\"-URI:er i din sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+# "Package" är en sträng i konfigurationsfilen
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Ogiltig post i konfigurationsfilen %s, \"Package\"-rubriken saknas"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Förstod inte nåltypen %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Prioritet ej angiven (eller noll) för nål"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Kunde inte genomföra omedelbar konfiguration på \"%s\". Se man 5 apt.conf "
+"under APT::Immediate-Configure för information. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Kunde inte öppna filen \"%s\""
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"För att genomföra installationen måste det systemkritiska paketet %s "
+"tillfälligt tas bort på grund av en beroendespiral i Conflicts/Pre-Depends. "
+"Detta är oftast en dålig idé, men om du verkligen vill göra det kan du "
+"aktivera flaggan \"APT::Force-LoopBreak\"."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Rad %u är för lång i källistan %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Avmonterar CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Använder cd-rom-monteringspunkten %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Avmonterar cd-rom\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Väntar på skiva...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Monterar cd-rom...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "Identifierar.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "Identifierar... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Lagrad etikett: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Avmonterar cd-rom...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Söker efter indexfiler på skivan...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3195,7 +2408,7 @@ msgstr ""
 "Hittade %zu paketindex, %zu källkodsindex, %zu översättningsindex och %zu "
 "signaturer\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3203,16 +2416,16 @@ msgstr ""
 "Kunde inte hitta några paketfiler. Detta är kanske inte en Debian-skiva "
 "eller felaktig arkitektur?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Hittade etiketten \"%s\"\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Namnet är ogiltigt, försök igen.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3221,80 +2434,105 @@ msgstr ""
 "Denna skiva heter: \n"
 "\"%s\"\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Kopierar paketlistor..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Skriver ny källista\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Poster i källistan för denna skiva:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Skrev %i poster.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Skrev %i poster med %i saknade filer.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på "
+"tillbakahållna paket."
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bygger beroendeträd"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandiderande versioner"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Beroendegenerering"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Läser tillståndsinformation"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Skrev %i poster med %i filer som inte stämmer\n"
+msgid "Failed to open StateFile %s"
+msgstr "Misslyckades med att öppna StateFile %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, 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"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Misslyckades med att skriva temporär StateFile %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Kan inte hitta autentiseringspost för: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Kunde inte tolka paketfilen %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash-kontrollsumman stämmer inte för: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Kunde inte tolka paketfilen %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version \"%s\" för \"%s\" hittades inte"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Kunde inte hitta funktionen \"%s\""
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Kan inte välja versioner från paketet \"%s\" eftersom det är helt virtuellt"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3303,177 +2541,239 @@ msgstr ""
 "Kan inte välja installerad version eller kandidatversion från paketet \"%s\" "
 "eftersom det inte har någon av dem"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Kan inte välja senaste version från paketet \"%s\" eftersom det är helt "
 "virtuellt"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Kan inte välja kandidatversion från paketet %s eftersom det inte har någon "
 "kandidat"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Kan inte välja installerad version från paketet %s eftersom det inte är "
 "installerat"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Kunde inte tolka \"Release\"-filen %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Inga sektioner i Release-filen %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ingen Hash-post i Release-filen %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ogiltig \"Date\"-post i Release-filen %s"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
+
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Kör dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Rad %lu i källistan %s har fel format ([option] för kort)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla "
-"använts istället."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Rad %lu i källistan %s har  (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Rad %lu i källistan %s har fel format (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Rad %lu i källistan %s har fel format (Absolut dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Öppnar %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Rad %u i källistan %s har fel format (typ)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Installerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigurerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Tar bort %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Tar bort hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Uppmärksammar försvinnandet av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Kör efterinstallationsutlösare %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Katalogen \"%s\" saknas"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Kunde inte öppna filen \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Förbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Packar upp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Förbereder konfigurering av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Installerade %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Förbereder borttagning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Tog bort %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Förbereder borttagning av hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Tog bort hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Kunde inte skriva till %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "beroendeproblem - lämnar okonfigurerad"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3481,7 +2781,7 @@ msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är "
 "ett efterföljande fel från ett tidigare problem."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3489,7 +2789,7 @@ msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
 "diskutrymmet är slut"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3497,7 +2797,7 @@ msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
 "är slut"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3506,14 +2806,14 @@ msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
 "diskutrymmet är slut"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar ett in-/ut-"
 "fel för dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3521,24 +2821,757 @@ msgid ""
 msgstr ""
 "Kunde inte låsa administrationskatalogen (%s). Använder en annan process den?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg avbröts. Du måste köra \"%s\" manuellt för att korrigera problemet. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Inte låst"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Valet %s hittades inte"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Använder inte låsning för skrivskyddade låsfilen %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Kunde inte öppna låsfilen %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Använder inte låsning för nfs-monterade låsfilen %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Kunde inte erhålla låset %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, 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:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Underprocessen %s tog emot signal %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Underprocessen %s svarade med en felkod (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Underprocessen %s avslutades oväntat"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problem med att stänga gzip-filen %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Kunde inte öppna filen %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Kunde inte öppna filhandtag %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Misslyckades med att skapa underprocess-IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Misslyckades med att starta komprimerare "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problem med att stänga filen %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem med att byta namn på filen %s till %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problem med att avlänka filen %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problem med att synkronisera filen"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Fel!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Färdig"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Färdig"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Kan inte utföra mmap på en tom fil"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Kunde inte duplicera filhandtag %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Kunde inte utföra mmap på %lu byte"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Kunde inte stänga mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Kunde inte synkronisera mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Kunde inte utföra mmap på %lu byte"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Misslyckades med att kapa av filen"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Start. "
+"Aktuellt värde: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Kunde inte öka storleken för MMap eftersom gränsen på %lu byte redan har "
+"uppnåtts."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Kunde inte öka storleken för MMap eftersom automatisk växt har inaktiverats "
+"av användaren."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Kunde inte ta status på monteringspunkten %s."
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Kunde inte ta status på cd-romen."
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Okänd typförkortning: \"%c\""
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Öppnar konfigurationsfilen %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaxfel %s:%u: Felformat märke"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaxfel %s:%u: Inkluderad härifrån"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "Syntaxfel %s:%u: clear-direktivet kräver ett flaggträd som argument"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nyckelring installerad i %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Kommandoradsflaggan \"%c\" [från %s] är inte känd."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Förstår inte kommandoradsflaggan %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Kommandoradsflaggan %s är inte boolsk"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Flaggan %s kräver ett argument."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"Flaggan %s: Den angivna konfigurationsposten måste innehålla ett =<värde>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Flaggan %s kräver ett heltalsargument, inte \"%s\""
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Flaggan \"%s\" är för lång"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Förstår inte %s, prova med \"true\" eller \"false\"."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Felaktig åtgärd %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Användning: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n"
+"och mallinformation från paket\n"
+"\n"
+"Flaggor:\n"
+"  -h   Denna hjälptext.\n"
+"  -t   Ställ in temporärkatalogen.\n"
+"  -c=? Läs denna konfigurationsfil.\n"
+"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Kunde inte ta status på %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Listan över filtillägg för Packages är för lång"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Fel vid behandling av katalogen %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Listan över filtillägg för Sources är för lång"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Fel vid skrivning av rubrik till innehållsfil"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Fel vid behandling av innehållet %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Användning: apt-ftparchive [flaggor] kommando\n"
+"Kommandon: packages binärsökväg [åsidosättningsfil [sökvägsprefix]]\n"
+"           sources källsökväg [åsidosättningsfil [sökvägsprefix]]\n"
+"           contents sökväg\n"
+"           release sökväg\n"
+"           generate konfiguration [grupper]\n"
+"           clean konfiguration\n"
+"\n"
+"apt-ftparchive genererar indexfiler för Debianarkiv. Det stöder många\n"
+"former av generering, allt från helautomatiserat till funktionella\n"
+"ersättningar till dpkg-scanpackages och dpkg-scansources\n"
+"\n"
+"apt-ftparchive skapar Package-filer från ett träd med .deb-filer.\n"
+"Packagefilen innehåller alla styrfälten från paketen samt MD5-hashvärdet\n"
+"och filstorlek. En overrride-fil stöds för att tvinga värden på Priority\n"
+"och Section.\n"
+"\n"
+"På samma sätt skapar apt-ftparchive Sources-filer från ett träd med\n"
+".dsc-filer. Flaggan --source-override kan användas för att ange en\n"
+"override-fil för källkoden.\n"
+"\n"
+"Kommandona \"packages\" och \"sources\" bör köras från rotet på trädet.\n"
+"Binärsökvägen bör peka på basen på den rekursiva sökningen och\n"
+"override-filen bör innehålla override-flaggorna de framtvingade flaggorna.\n"
+"Sökvägsprefixet läggs till i filnamnsfälten om det anges. Ett exempel på\n"
+"hur programmet kan användas från Debianarkivet:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Flaggor:\n"
+"  -h    Denna hjälptext\n"
+"  --md5 Kontrollera generering av MD5\n"
+"  -s=?  Källkods-override-fil\n"
+"  -q    Tyst\n"
+"  -d=?  Väljer den valfria cachedatabasen\n"
+"  --no-delink Aktivera \"delinkning\"-felsökningsläget\n"
+"  --contents  Styr skapande av contents-fil\n"
+"  -c=?  Läs denna konfigurationsfil\n"
+"  -o=?  Ställ in en godtycklig konfigurationsflagga"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Inga val träffades"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Några filer saknas i paketfilsgruppen \"%s\""
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB var skadad, filen omdöpt till %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB är gammal, försöker uppgradera %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar "
+"från en äldre version av apt."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Kunde inte öppna DB-filen %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Arkivet har ingen styrpost"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Kunde inte få tag i någon markör"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "V: Kunde inte läsa katalogen %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "V: Kunde inte ta status på %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "F: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "V: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "F: Felen gäller filen "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Misslyckades med att slå upp %s"
+
+# ???
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Trädvandring misslyckades"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Misslyckades med att öppna %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " Avlänka %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Misslyckades med att läsa länken %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Misslyckades med att länka ut %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Misslyckades med att länka %s till %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Avlänkningsgränsen på %sB nåddes.\n"
+
+# Fält vid namn "Package"
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Arkivet har inget package-fält"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s har ingen post i override-filen\n"
+
+# parametrar: paket, ny, gammal
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  ansvarig för paketet %s är %s ej %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s har ingen källåsidosättningspost\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s har heller ingen binär åsidosättningspost\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Misslyckades med att allokera minne"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Kunde inte öppna %s"
+
+# parametrar: filnamn, radnummer
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Felaktig override %s rad %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Misslyckades med att läsa åsidosättningsfilen %s"
+
+# parametrar: filnamn, radnummer
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Felaktig override %s rad %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Felaktig override %s rad %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Felaktig override %s rad %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Okänd komprimeringsalgoritm \"%s\""
+
+# ???
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Misslyckades med att skapa FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Misslyckades med att grena process"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Barnprocess för komprimering"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Internt fel, misslyckades med att skapa %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "In/ut för underprocess/fil misslyckades"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Misslyckades med att läsa vid beräkning av MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem med att länka ut %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Användning: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n"
+"och mallinformation från paket\n"
+"\n"
+"Flaggor:\n"
+"  -h   Denna hjälptext.\n"
+"  -t   Ställ in temporärkatalogen.\n"
+"  -c=? Läs denna konfigurationsfil.\n"
+"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Okänd paketpost!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Användning: apt-sortpkgs [flaggor] fil1 [fil2 ...]\n"
+"\n"
+"apt-sortpkgs är ett enkelt verktyg för att sortera paketfiler. Flaggan\n"
+"-s anges för att ange filens typ.\n"
+"\n"
+"Flaggor:\n"
+"  -h   Denna hjälptext.\n"
+"  -s   Använd källkodsfilssortering.\n"
+"  -c=? Läs denna konfigurationsfil.\n"
+"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s är inte ett giltigt DEB-paket."
 
diff --git a/po/th.po b/po/th.po
index 3129e2686..e59a57d0d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,16 +1,16 @@
 # Thai translation of apt.
-# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the apt package.
-# Theppiak Karoonboonyanan <thep@linux.thai.net>, 2007-2008, 2012.
+# Theppiak Karoonboonyanan <thep@debian.org>, 2007-2008, 2012, 2014.
 # Arthit Suriyawongkul <arthit@gmail.com>, 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
-"PO-Revision-Date: 2012-10-27 22:44+0700\n"
-"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"PO-Revision-Date: 2014-04-20 09:38+0700\n"
+"Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "Language: th\n"
 "MIME-Version: 1.0\n"
@@ -18,152 +18,153 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "แพกเกจ %s รุ่น %s ขาดแพกเกจที่ต้องใช้:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "จำนวนชื่อแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "จำนวนโครงสร้างแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  แพกเกจปกติ: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  แพกเกจเสมือนแท้ๆ: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  แพกเกจเสมือนที่มีแพกเกจจริงเดียว: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  แพกเกจเสมือนผสม: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  แพกเกจที่ขาดหาย: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "จำนวนรุ่นที่แตกต่างกันทั้งหมด: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "จำนวนคำบรรยายแพกเกจที่แตกต่างกันทั้งหมด: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "จำนวนการเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "จำนวนความสัมพันธ์ รุ่น/แฟ้ม ทั้งหมด: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "จำนวนความสัมพันธ์ คำบรรยาย/แฟ้ม ทั้งหมด: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "จำนวนผังการตระเตรียมทั้งหมด: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "จำนวนสตริงทั้งหมด: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "ขนาดของพื้นที่ความเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "พื้นที่สำรองทั้งหมด: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "พื้นที่ที่นับรวมทั้งหมด: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง"
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "ไม่พบแพกเกจ"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "คุณต้องระบุแพตเทิร์นสำหรับค้นหาอย่างน้อยหนึ่งแพตเทิร์น"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark showauto' แทน"
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ไม่พบแพกเกจ %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "แฟ้มแพกเกจ:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "ข้อมูลแคชไม่ตรงกับความเป็นจริงแล้ว ไม่สามารถอ้างอิงไขว้ระหว่างแฟ้มแพกเกจ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "แพกเกจที่ถูกตรึง:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(ไม่พบ)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  ที่ติดตั้งอยู่: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  รุ่นที่ติดตั้งได้: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(ไม่มี)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  การตรึงแพกเกจ: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  ตารางรุ่น:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -233,28 +234,31 @@ msgstr ""
 "  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 "กรุณาอ่านข้อมูลเพิ่มเติมจาก manual page apt-cache(8) และ apt.conf(5)\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "กรุณาตั้งชื่อแผ่น เช่น 'Debian 5.0.3 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "กรุณาใส่แผ่นลงในไดรว์แล้วกด enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "ไม่สามารถเมานท์ '%s' ที่ '%s'"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+"การตรวจซีดีรอมอัตโนมัติไม่พบซีดีรอมใดที่จุดเมานท์ปริยาย\n"
+"คุณอาจลองใช้ตัวเลือก --cdrom เพื่อกำหนดจุดเมานท์ของซีดีรอมได้\n"
+"อ่านข้อมูลเพิ่มเติมเกี่ยวกับการตรวจซีดีรอมอัตโนมัติและจุดเมานท์ได้จาก 'man apt-cdrom'"
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ทำเช่นนี้ต่อไปกับแผ่นซีดีที่เหลือในชุด"
 
@@ -290,65 +294,65 @@ msgstr ""
 "  -c=? อ่านแฟ้มค่าตั้งที่กำหนด\n"
 "  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:245
+#, c-format
 msgid "Can not find a package for architecture '%s'"
-msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
+msgstr "ไม่พบแพกเกจสำหรับสถาปัตยกรรม '%s'"
 
-#: cmdline/apt-get.cc:326
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:327
+#, c-format
 msgid "Can not find a package '%s' with version '%s'"
-msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
+msgstr "ไม่พบแพกเกจ '%s' ที่มีรุ่นเป็น '%s'"
 
-#: cmdline/apt-get.cc:329
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:330
+#, c-format
 msgid "Can not find a package '%s' with release '%s'"
-msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
+msgstr "ไม่พบแพกเกจ '%s' ที่มีชุดจัดแจกเป็น '%s'"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "จะเลือก '%s' เป็นแพกเกจซอร์สแทน '%s'\n"
 
-#: cmdline/apt-get.cc:422
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:423
+#, c-format
 msgid "Can not find version '%s' of package '%s'"
-msgstr "จะละเลยรุ่น '%s' ที่ไม่มีอยู่ของแพกเกจ '%s'"
+msgstr "ไม่พบรุ่น '%s' ของแพกเกจ '%s'"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ไม่พบแพกเกจ %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "กำหนด %s ให้เป็นการติดตั้งแบบอัตโนมัติแล้ว\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark auto' และ 'apt-mark manual' แทน"
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
@@ -373,78 +377,78 @@ msgstr ""
 "bzr branch %s\n"
 "เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ดาวน์โหลดซอร์ส %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "คำสั่ง build '%s' ล้มเหลว\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "โพรเซสลูกล้มเหลว"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -452,17 +456,17 @@ msgid ""
 msgstr ""
 "ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -470,19 +474,19 @@ msgid ""
 msgstr ""
 "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, 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:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -491,37 +495,37 @@ msgstr ""
 "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
 "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะ %s ไม่มีรุ่นที่ติดตั้งได้"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "ปูมการแก้ไขสำหรับ %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "มอดูลที่รองรับ:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -608,54 +612,82 @@ msgstr ""
 "และ apt.conf(5)\n"
 "                       APT นี้มีพลังของ Super Cow\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+msgid "Must specify at least one pair url/filename"
+msgstr "ต้องระบุคู่ URL, ชื่อแฟ้ม อย่างน้อยหนึ่งคู่"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr "ดาวน์โหลดไม่สำเร็จ"
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+"วิธีใช้: apt-helper [ตัวเลือก] คำสั่ง\n"
+"      apt-helper [ตัวเลือก] download-file URI พาธปลายทาง\n"
+"\n"
+"apt-helper เป็นโปรแกรมช่วยเหลือภายในของ apt\n"
+"\n"
+"คำสั่ง:\n"
+"   download-file - ดาวน์โหลด URI ที่กำหนดลงในพาธปลายทาง\n"
+"\n"
+"                       โปรแกรมช่วยเหลือของ APT นี้มีพลัง Super Meep\n"
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s ไม่สามารถทำเครื่องหมายได้ เพราะไม่ได้ติดตั้งไว้\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s ถูกกำหนดให้เป็นการติดตั้งแบบเลือกเองอยู่ก่อนแล้ว\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s ถูกกำหนดให้เป็นการติดตั้งแบบอัตโนมัติอยู่ก่อนแล้ว\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ถูกกำหนดให้คงรุ่นอยู่ก่อนแล้ว\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ว\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "กำหนด %s ให้คงรุ่นแล้ว\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "ยกเลิกการคงรุ่นของ %s แล้ว\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "เรียกทำงาน dpkg ไม่สำเร็จ คุณเป็น root หรือเปล่า?"
 
-#: cmdline/apt-mark.cc:381
-#, fuzzy
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -689,6 +721,12 @@ msgstr ""
 "คำสั่ง:\n"
 "   auto - ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการติดตั้งแบบอัตโนมัติ\n"
 "   manual - ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการติดตั้งแบบเลือกเอง\n"
+"   hold - ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการคงรุ่น\n"
+"   unhold - ลบการทำเครื่องหมายการคงรุ่นจากแพกเกจที่กำหนด\n"
+"   showauto - แสดงรายชื่อของแพกเกจที่ติดตั้งแบบอัตโนมัติ\n"
+"   showmanual - แสดงรายชื่อของแพกเกจที่ติดตั้งแบบเลือกเอง\n"
+"   showhold - แสดงรายชื่อของแพกเกจที่คงรุ่นอยู่\n"
+"\n"
 "ตัวเลือก:\n"
 "  -h  แสดงข้อความช่วยเหลือนี้\n"
 "  -q  แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n"
@@ -699,7 +737,7 @@ msgstr ""
 "  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 "กรุณาอ่านข้อมูลเพิ่มเติมจาก manual page apt-mark(8) และ apt.conf(5)"
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -720,6 +758,23 @@ msgid ""
 "\n"
 " edit-sources - edit the source information file\n"
 msgstr ""
+"วิธีใช้: apt [ตัวเลือก] คำสั่ง\n"
+"\n"
+"บรรทัดคำสั่งสำหรับ apt\n"
+"คำสั่งพื้นฐาน:\n"
+" list - แสดงรายชื่อแพกเกจที่มีชื่อตรงกับรูปแบบที่กำหนด\n"
+" search - ค้นหาในคำบรรยายแพกเกจ\n"
+" show - แสดงรายละเอียดของแพกเกจ\n"
+"\n"
+" update - ปรับข้อมูลรายชื่อของแพกเกจที่มี\n"
+"\n"
+" install - ติดตั้งแพกเกจ\n"
+" remove  - ถอดถอนแพกเกจ\n"
+"\n"
+" upgrade - ปรับรุ่นระบบโดยติดตั้ง/ปรับรุ่นแพกเกจต่างๆ\n"
+" full-upgrade - ปรับรุ่นระบบโดยถอดถอน/ติดตั้ง/ปรับรุ่นแพกเกจต่างๆ\n"
+"\n"
+" edit-sources - แก้ไขแฟ้มข้อมูลแหล่งแพกเกจ\n"
 
 #: methods/cdrom.cc:203
 #, c-format
@@ -746,172 +801,174 @@ msgstr "ไม่สามารถเลิกเมานท์ซีดีร
 msgid "Disk not found."
 msgstr "ไม่พบแผ่น"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "ไม่พบแฟ้ม"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "stat ไม่สำเร็จ"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI ไม่ถูกต้อง  URI ของแฟ้มในเครื่องต้องขึ้นต้นด้วย //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "เข้าระบบ"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "ไม่สามารถอ่านชื่อของอีกฝ่ายได้"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "ไม่สามารถอ่านชื่อของเครื่องนี้ได้"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "เซิร์ฟเวอร์ปฏิเสธการเชื่อมต่อโดยรายงานว่า: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr "มีการระบุพร็อกซี แต่ไม่มีสคริปต์สำหรับเข้าระบบ ค่า Acquire::ftp:ProxyLogin ว่างเปล่า"
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "คำสั่งสคริปต์เข้าระบบ '%s' ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "หมดเวลารอเชื่อมต่อ"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "การอ่านข้อมูลผิดพลาด"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "คำตอบท่วมบัฟเฟอร์"
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "มีความเสียหายของโพรโทคอล"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "การเขียนข้อมูลผิดพลาด"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "ไม่สามารถสร้างซ็อกเก็ต"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "ล้มเหลว"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "ไม่สามารถเชื่อมต่อซ็อกเกตแบบ passive"
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ไม่สามารถนำซ็อกเก็ตที่รอรับการเชื่อมต่อมาใช้"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "ไม่สามารถ bind ซ็อกเก็ต"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "ไม่สามารถ listen ที่ซ็อกเก็ต"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "ไม่สามารถระบุชื่อซ็อกเก็ต"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "ไม่สามารถส่งคำสั่ง PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "ไม่รู้จักตระกูลที่อยู่ %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "หมดเวลารอเชื่อมต่อซ็อกเก็ตข้อมูล"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "ไม่สามารถรับการเชื่อมต่อ"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "ไม่สามารถดาวน์โหลดแฟ้ม เซิร์ฟเวอร์ตอบว่า: '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "หมดเวลาคอยที่ซ็อกเก็ตข้อมูล"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "ถ่ายโอนข้อมูลไม่สำเร็จ เซิร์ฟเวอร์ตอบว่า '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "สอบถาม"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "ไม่สามารถเรียก "
 
@@ -947,7 +1004,7 @@ msgstr "ไม่สามารถเชื่อมต่อไปยัง %s
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "เชื่อมต่อไปยัง %s"
@@ -960,12 +1017,12 @@ msgstr "ไม่สามารถเปิดหาที่อยู่ '%s'"
 #: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
-msgstr "เกิดข้อผิดพลาดชั่วคราวขณะเปิดหาที่อยู่ '%s'"
+msgstr "เกิดความล้มเหลวชั่วคราวขณะเปิดหาที่อยู่ '%s'"
 
 #: methods/connect.cc:209
-#, fuzzy, c-format
+#, c-format
 msgid "System error resolving '%s:%s'"
-msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i - %s)"
+msgstr "เกิดข้อผิดพลาดในระบบขณะเปิดหาที่อยู่ '%s:%s'"
 
 #: methods/connect.cc:211
 #, c-format
@@ -977,181 +1034,411 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง
 msgid "Unable to connect to %s:%s:"
 msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "ไม่สามารถเรียก 'gpgv' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
+"แฟ้มที่เซ็นกำกับครอบข้อความมีเนื้อหาไม่ถูกต้อง ได้รับผลลัพธ์ "
+"'%s' (เครือข่ายต้องยืนยันตัวบุคคลหรือไม่?)"
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีกุญแจสาธารณะ:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "select ไม่สำเร็จ"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "หมดเวลารอเชื่อมต่อ"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "รอหัวข้อมูล"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถูกต้อง"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถูกต้อง"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถูกต้อง"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "การสนับสนุน Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "ข้อมูลส่วนหัวผิดพลาด"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "กำลังคำนวณการปรับรุ่น... "
+
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
+msgstr "เกิดข้อผิดพลาดภายใน: การปรับรุ่นทำความเสียหาย"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "เสร็จแล้ว"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr "กำลังเรียงลำดับ"
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
+msgstr "กำลังแสดงรายชื่อ"
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "มีอีก %i รุ่น กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ล้มเหลว"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " เสร็จแล้ว"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "ไม่ทราบ"
+
+#: apt-private/private-output.cc:232
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[ติดตั้งอยู่,สามารถปรับรุ่นเป็น: %s]"
+
+#: apt-private/private-output.cc:236
+msgid "[installed,local]"
+msgstr "[ติดตั้งอยู่,ในเครื่อง]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr "[ติดตั้งอยู่,ถอดถอนอัตโนมัติได้]"
+
+#: apt-private/private-output.cc:241
+msgid "[installed,automatic]"
+msgstr "[ติดตั้งอยู่,อัตโนมัติ]"
+
+#: apt-private/private-output.cc:243
+msgid "[installed]"
+msgstr "[ติดตั้งอยู่]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[สามารถปรับรุ่นจาก: %s]"
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr "[ค่าตั้งตกค้าง]"
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "แต่ไม่สามารถติดตั้งได้"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "แต่ได้ติดตั้งไว้"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " หรือ"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (เนื่องจาก %s) "
+
+#: apt-private/private-output.cc:662
+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"
+"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "ติดตั้งซ้ำ %lu, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "ปรับรุ่นลง %lu, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "มีอีก %i ระเบียน กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "ไม่ใช่แพกเกจจริง (เสมือน)"
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้"
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "แปลกประหลาด.. ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "แปลกประหลาด... ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "ต้องดาวน์โหลดแพกเกจ %sB/%sB\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "ต้องดาวน์โหลดแพกเกจ %sB\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "หลังจากการกระทำนี้ ต้องใช้เนื้อที่บนดิสก์อีก %sB\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย"
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1162,19 +1449,19 @@ msgstr ""
 "หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "เลิกทำ"
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1182,19 +1469,19 @@ msgstr ""
 "ดาวน์โหลดบางแพกเกจไม่สำเร็จ บางที การเรียก apt-get update หรือลองใช้ตัวเลือก --fix-"
 "missing อาจช่วยได้"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้"
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "จะล้มเลิกการติดตั้ง"
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1205,15 +1492,15 @@ msgstr[0] ""
 "แพกเกจต่อไปนี้ได้หายไปจากระบบของคุณ เพราะแฟ้มทั้งหมดได้ถูกแทนที่\n"
 "โดยแพกเกจอื่นแล้ว:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "หมายเหตุ: นี่เป็นสิ่งที่ dpkg ทำโดยอัตโนมัติโดยเจตนา"
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1231,15 +1518,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1247,23 +1534,23 @@ msgid_plural ""
 "required:"
 msgstr[0] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
 msgstr[0] "มีแพกเกจ %lu แพกเกจถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "ใช้ 'apt-get autoremove' เพื่อถอดถอนแพกเกจดังกล่าวได้"
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "คุณอาจเรียก 'apt-get -f install' เพื่อแก้ปัญหานี้ได้:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1271,7 +1558,7 @@ msgstr ""
 "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
 "(หรือจะระบุทางแก้ก็ได้)"
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1282,321 +1569,96 @@ msgstr ""
 "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n"
 "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming"
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "แพกเกจมีปัญหา"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "แพกเกจที่แนะนำ:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"หมายเหตุ: นี่เป็นเพียงการจำลองการทำงานเท่านั้น!\n"
+"         การทำงานจริงของ apt-get ต้องอาศัยสิทธิ์ผู้ดูแลระบบ\n"
+"         อย่าลืมด้วยว่าการล็อคก็ไม่ทำงานเช่นกัน\n"
+"         ดังนั้น อย่าถือผลลัพธ์นี้ว่าตรงกับสภาพความเป็นจริงของระบบ!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ไม่สามารถดาวน์โหลด %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [ติดตั้งอยู่]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [ติดตั้งอยู่]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [ติดตั้งอยู่]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [ติดตั้งอยู่]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "แต่ไม่สามารถติดตั้งได้"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "แต่ได้ติดตั้งไว้"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " หรือ"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (เนื่องจาก %s) "
-
-#: apt-private/private-output.cc:631
-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"
-"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
-
-#: apt-private/private-output.cc:666
+#: apt-private/private-sources.cc:58
 #, c-format
-msgid "%lu reinstalled, "
-msgstr "ติดตั้งซ้ำ %lu, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "ปรับรุ่นลง %lu, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " ล้มเหลว"
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " เสร็จแล้ว"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "กำลังคำนวณการปรับรุ่น... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "เสร็จแล้ว"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"หมายเหตุ: นี่เป็นเพียงการจำลองการทำงานเท่านั้น!\n"
-"         การทำงานจริงของ apt-get ต้องอาศัยสิทธิ์ผู้ดูแลระบบ\n"
-"         อย่าลืมด้วยว่าการล็อคก็ไม่ทำงานเช่นกัน\n"
-"         ดังนั้น อย่าถือผลลัพธ์นี้ว่าตรงกับสภาพความเป็นจริงของระบบ!"
-
-#: apt-private/private-sources.cc:45
-#, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
-msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
+msgstr "แจง %s ไม่สำเร็จ จะแก้ไขอีกครั้งหรือไม่? "
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgstr "แฟ้ม '%s' ของคุณมีการเปลี่ยนแปลง กรุณาเรียก 'apt-get update'"
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr "ค้นทั่วทั้งเนื้อความ"
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "เจอ "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "ดึง:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "ข้าม "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "ปัญหา "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [กำลังทำงาน]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1609,19 +1671,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "ไม่สามารถอ่าน %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s"
@@ -1641,20 +1703,20 @@ msgid "Can not read mirror file '%s'"
 msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำเนา '%s'"
 
 #: methods/mirror.cc:315
-#, fuzzy, c-format
+#, c-format
 msgid "No entry found in mirror file '%s'"
-msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำเนา '%s'"
+msgstr "ไม่พบรายการในแฟ้มแหล่งสำเนา '%s'"
 
 #: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[แหล่งสำเนา: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร"
 
@@ -1692,1308 +1754,443 @@ msgstr "กรุณาแก้ปัญหาเหล่านั้น แ�
 msgid "Merging available information"
 msgstr "กำลังผสานรายชื่อของแพกเกจที่มี"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"วิธีใช้: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates เป็นเครื่องมือสำหรับแยกเอาข้อมูลการตั้งค่าและเทมเพลต\n"
-"ออกมาจากแพกเกจเดเบียน\n"
-"\n"
-"ตัวเลือก:\n"
-"  -h   แสดงข้อความช่วยเหลือนี้\n"
-"  -t   กำหนดไดเรกทอรีทำงานชั่วคราว\n"
-"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
-"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"วิธีใช้: apt-ftparchive [ตัวเลือก] คำสั่ง\n"
-"คำสั่ง: 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 ใช้สร้างแฟ้มดัชนีสำหรับแหล่งแพกเกจเดเบียน รองรับวิธีสร้างหลายแบบ\n"
-"ตั้งแต่แบบอัตโนมัติทั้งหมด ไปจนถึงการใช้แทน dpkg-scanpackages และ dpkg-scansources\n"
-"\n"
-"apt-ftparchive สร้างแฟ้ม Package จากต้นไม้ไดเรกทอรีที่เก็บ .deb  แฟ้ม Package\n"
-"จะรวมเนื้อหาข้อมูลควบคุมทุกรายการของแต่ละแพกเกจ รวมถึง MD5 hash และขนาดแฟ้ม\n"
-"และรองรับการสร้างแฟ้ม override เพื่อบังคับค่าลำดับความสำคัญและหมวดแพกเกจด้วย\n"
-"\n"
-"ในทำนองเดียวกัน apt-ftparchive จะสร้างแฟ้ม Sources จากต้นไม้ไดเรกทอรีที่เก็บ .dsc\n"
-"คุณสามารถใช้ตัวเลือก --source-override เพื่อระบุแฟ้ม override สำหรับซอร์สได้\n"
-"\n"
-"คำสั่ง 'packages' และ 'sources' ควรเรียกที่ตำแหน่งรากของต้นไม้ไดเรกทอรี\n"
-"ค่า binarypath ควรชี้ไปที่ตำแหน่งฐานที่จะค้นหาแบบทั่วถึง  และแฟ้ม override ก็ควรมีแฟล็ก\n"
-"override ต่างๆ สำหรับแพกเกจ  ค่า pathprefix จะถูกเพิ่มเข้าที่หน้าข้อมูล filename ถ้ามี\n"
-"ตัวอย่างการใช้งานจากแหล่งแพกเกจเดเบียน:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"ตัวเลือก:\n"
-"  -h    แสดงข้อความช่วยเหลือนี้\n"
-"  --md5 ควบคุมการสร้าง MD5\n"
-"  -s=?  แฟ้ม override สำหรับซอร์ส\n"
-"  -q    ทำงานแบบเงียบ\n"
-"  -d=?  เลือกฐานข้อมูลแคชอื่น\n"
-"  --no-delink เปิดโหมดดีบั๊กสำหรับการตัดลิงก์\n"
-"  --contents  ควบคุมการสร้างแฟ้มสารบัญ\n"
-"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
-"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "ไม่มีรายการเลือกที่ตรง"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB เสีย จะเปลี่ยนชื่อแฟ้มเป็น %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่"
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "stat %s ไม่สำเร็จ"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "แพกเกจไม่มีระเบียนควบคุม"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: stat %s ไม่สำเร็จ\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "หาพาธเต็มของ %s ไม่สำเร็จ"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "เดินท่องต้นไม้ไม่สำเร็จ"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "เปิด %s ไม่สำเร็จ"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink %s ไม่สำเร็จ"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "unlink %s ไม่สำเร็จ"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s ไม่มีข้อมูล override\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - จองหน่วยความจำไม่สำเร็จ"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "ไม่สามารถเปิด %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "ไม่สามารถอ่านแฟ้ม override %s"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "ไม่รู้จักอัลกอริทึมบีบอัด '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "ผลลัพธ์ของการบีบอัด %s ต้องมีชุดของการบีบอัดด้วย"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "สร้าง FILE* ไม่สำเร็จ"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "fork ไม่สำเร็จ"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "โพรเซสลูกสำหรับบีบอัด"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "มีปัญหาขณะลบแฟ้ม %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"วิธีใช้: apt-internal-solver\n"
-"\n"
-"apt-internal-solver "
-"เป็นเครื่องมือสำหรับเรียกใช้กลไกภายในปัจจุบันเสมือนเป็นกลไกการแก้ปัญหาภายนอกสำหรับโปรแกรมตระกูล "
-"APT เพื่อการดีบั๊กหรืออะไรทำนองนี้\n"
-"\n"
-"ตัวเลือก:\n"
-"  -h  แสดงข้อความช่วยเหลือนี้\n"
-"  -q  แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n"
-"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
-"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "พบระเบียนแพกเกจที่ไม่รู้จัก!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"วิธีใช้: apt-sortpkgs [ตัวเลือก] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs เป็นเครื่องมืออย่างง่ายสำหรับเรียงลำดับแฟ้มรายชื่อแพกเกจ ตัวเลือก -s\n"
-"ใช้สำหรับระบุชนิดของแฟ้มที่เรียง\n"
-"\n"
-"ตัวเลือก:\n"
-"  -h   แสดงข้อความช่วยเหลือนี้\n"
-"  -s   เรียงตามแฟ้มซอร์สโค้ด\n"
-"  -c=? อ่านแฟ้มค่าตั้งนี้\n"
-"  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "สร้างไปป์ไม่สำเร็จ"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "เรียก gzip ไม่สำเร็จ"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "แฟ้มจัดเก็บเสียหาย"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "เอกลักษณ์ของแฟ้มจัดเก็บไม่ถูกต้อง"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บ"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "ข้อมูลส่วนหัว %s ของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "ข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "แฟ้มจัดเก็บสั้นเกินไป"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "อ่านข้อมูลส่วนหัวของแฟ้มจัดเก็บไม่สำเร็จ"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode ถูกเรียกใช้กับโหนดที่ยังลิงก์อยู่"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "หาสมาชิกในตารางแฮชไม่สำเร็จ!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
-msgstr "จองเนื้อที่สำหรับ diversion ไม่สำเร็จ"
+msgstr "จองเนื้อที่สำหรับการเบนแฟ้มไม่สำเร็จ"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "ข้อผิดพลาดภายในที่ AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: 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:508
+#: 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:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "ไม่สามารถเขียนแฟ้ม %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "ไม่สามารถปิดแฟ้ม %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "พาธ %s ยาวเกินไป"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "พยายามแตกแพกเกจ %s มากกว่าหนึ่งครั้ง"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "ไดเรกทอรี %s ถูก divert"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของ diversion %s/%s"
+msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของการเบนแฟ้ม %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
-msgstr "พาธของ diversion ยาวเกินไป"
+msgstr "พาธของการเบนแฟ้มยาวเกินไป"
+
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "stat %s ไม่สำเร็จ"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "ไดเรกทอรี %s กำลังจะถูกแทนที่ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "หาโหนดใน bucket ของแฮชไม่พบ"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "พาธยาวเกินไป"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "พบแพกเกจที่เขียนทับโดยไม่มีข้อมูลรุ่นสำหรับ %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพกเกจ %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "ไม่สามารถ stat %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "ไม่สามารถเขียนแฟ้ม %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "ไม่สามารถปิดแฟ้ม %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่ใช้การได้ ขาดสมาชิก '%s'"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "ไม่สามารถแจงแฟ้มควบคุมได้"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "ไม่สามารถ mmap แฟ้มเปล่า"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "ไม่สามารถทำซ้ำ file descriptor %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "ไม่สามารถสร้าง mmap ขนาด %llu ไบต์"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "ไม่สามารถปิด mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "ไม่สามารถปรับ mmap ให้ตรงกัน"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "ไม่สามารถตัดท้ายแฟ้ม"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"MMap แบบพลวัตมีเนื้อที่ไม่พอ กรุณาเพิ่มขนาดของ APT::Cache-Start  ค่าปัจจุบัน: %lu (man 5 "
-"apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากถึงขีดจำกัด %lu ไบต์แล้ว"
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากผู้ใช้ปิดการขยายขนาดอัตโนมัติ"
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liชม. %liนาที %liวิ"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%liนาที %liวิ"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%liวิ"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "ไม่พบรายการเลือก %s"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ"
-
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า"
-
-#: apt-pkg/contrib/configuration.cc:861
-#, 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:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป"
-
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่"
-
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "ไวยากรณ์ผิดพลาด %s:%u: directive 'clear' ต้องมีอาร์กิวเมนต์เป็นลำดับชั้นตัวเลือก"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... ผิดพลาด!"
-
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... เสร็จแล้ว"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... เสร็จแล้ว"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "ไม่รู้จักตัวเลือกบรรทัดคำสั่ง '%c' [จาก %s]"
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "ไม่เข้าใจตัวเลือกบรรทัดคำสั่ง %s"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "ตัวเลือกบรรทัดคำสั่ง %s ไม่ได้เป็นค่าบูลีน"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "ตัวเลือก %s ต้องมีอาร์กิวเมนต์"
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "ตัวเลือก %s: การกำหนดรายการค่าตั้งต้องมี =<val>"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "เอกลักษณ์ของแฟ้มจัดเก็บไม่ถูกต้อง"
 
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "ตัวเลือก %s ต้องการอาร์กิวเมนต์จำนวนเต็ม ไม่ใช่ '%s'"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บ"
 
-#: apt-pkg/contrib/cmndline.cc:304
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Option '%s' is too long"
-msgstr "ตัวเลือก '%s' ยาวเกินไป"
+msgid "Invalid archive member header %s"
+msgstr "ข้อมูลส่วนหัว %s ของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง"
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "ไม่เข้าใจค่าบูลีน %s กรุณาลองใช้ true หรือ false"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "ข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง"
 
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "ไม่รู้จักคำสั่ง %s"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "แฟ้มจัดเก็บสั้นเกินไป"
 
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "ไม่สามารถ stat จุดเมานท์ %s"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "อ่านข้อมูลส่วนหัวของแฟ้มจัดเก็บไม่สำเร็จ"
 
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "ไม่สามารถ stat ซีดีรอม"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "สร้างไปป์ไม่สำเร็จ"
 
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "เกิดปัญหาขณะปิดแฟ้ม gzip %s"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "เรียก gzip ไม่สำเร็จ"
 
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "แฟ้มจัดเก็บเสียหาย"
 
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "ไม่สามารถเปิดแฟ้มล็อค %s"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Could not get lock %s"
-msgstr "ไม่สามารถล็อค %s"
+msgid "Unable to stat %s."
+msgstr "ไม่สามารถ stat %s"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "ไม่สามารถสร้างรายชื่อแฟ้มได้ เนื่องจาก '%s' ไม่ใช่ไดเรกทอรี"
+msgid "Progress: [%3i%%]"
+msgstr "ความคืบหน้า: [%3i%%]"
 
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่ใช่แฟ้มธรรมดา"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "กำลังเรียก dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่มีส่วนขยายในชื่อแฟ้ม"
+msgid "Packaging system '%s' is not supported"
+msgstr "ไม่รองรับระบบแพกเกจ '%s'"
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากส่วนขยายในชื่อแฟ้มไม่สามารถใช้การได้"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)"
+msgid "Wrote %i records.\n"
+msgstr "เขียนแล้ว %i ระเบียน\n"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n"
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Could not open file %s"
-msgstr "ไม่สามารถเปิดแฟ้ม %s"
+msgid "Can't find authentication record for: %s"
+msgstr "ไม่พบระเบียนยืนยันความแท้สำหรับ: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "ไม่สามารถเปิด file destriptor %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ"
+msgid "Hash mismatch for: %s"
+msgstr "แฮชไม่ตรงกันสำหรับ: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว"
+msgid "The method driver %s could not be found."
+msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้"
+msgid "Is the package %s installed?"
+msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "เกิดปัญหาขณะปิดแฟ้ม %s"
+msgid "Method %s did not start correctly"
+msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "เกิดปัญหาขณะลบแฟ้ม %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้"
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "เกิดปัญหาขณะ sync แฟ้ม"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "แคชของแพกเกจว่างเปล่า"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "แฟ้มแคชของแพกเกจเสียหาย"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "แฟ้มแคชของแพกเกจเป็นคนละรุ่นกัน"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "แฟ้มแคชของแพกเกจเสียหาย แฟ้มมีขนาดเล็กกว่าที่ควรจะเป็น"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่นแบบ '%s'"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "แคชของแพกเกจถูกสร้างมาสำหรับสถาปัตยกรรมอื่น"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "ต้องใช้"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "ต้องใช้ขณะติดตั้ง"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "แนะนำ"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "ควรใช้ร่วมกับ"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "ขัดแย้งกับ"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "แทนที่"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "ใช้แทน"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "ทำให้พัง"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "เพิ่มความสามารถ"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "สำคัญ"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "จำเป็น"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "มาตรฐาน"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "ตัวเลือก"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "ส่วนเสริม"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "รุ่นแพกเกจที่มี"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "สร้างลำดับความสัมพันธ์"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "กำลังอ่านข้อมูลสถานะ"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "กำลังเปิด %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป"
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 apt.conf ที่หัวข้อ "
-"APT::Immediate-Configure (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "ไม่สามารถตั้งค่า '%s'"
-
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"การติดตั้งครั้งนี้จำเป็นต้องลบแพกเกจ %s ชั่วคราว "
-"อันเนื่องมาจากความขัดแย้งหรือความขึ้นต่อกันระหว่างติดตั้งที่เป็นวงรอบ "
-"ซึ่งแพกเกจดังกล่าวเป็นแพกเกจที่จำเป็นสำหรับระบบ การลบดังกล่าวมักเป็นอันตราย "
-"แต่ถ้าคุณต้องการทำเช่นนั้นจริงๆ ก็ให้เปิดตัวเลือก APT::Force-LoopBreak"
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ"
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย "
-"อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้"
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้"
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial"
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial"
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "ไม่สามารถล็อคไดเรกทอรี %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li (เหลืออีก %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "ไม่รองรับระบบแพกเกจ '%s'"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "ไม่สามารถ stat %s"
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้"
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr "ค่า '%s' ไม่สามารถใช้กับ APT::Default-Release ได้ เนื่องจากรุ่นดังกล่าวไม่มีในแหล่ง"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง %s: ไม่มีข้อมูลส่วนหัว 'Package'"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "ไม่เข้าใจชนิดการตรึง %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "กำลังอ่านรายชื่อแพกเกจ"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "เตรียมรับคำตอบ"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "ผลรวมแฮชไม่ตรงกัน"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "ขนาดไม่ตรงกัน"
 
-#: apt-pkg/acquire-item.cc:164
-#, fuzzy
+#: apt-pkg/acquire-item.cc:173
 msgid "Invalid file format"
-msgstr "ไม่รู้จักคำสั่ง %s"
+msgstr "รูปแบบของแฟ้มไม่ถูกต้อง"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3002,16 +2199,16 @@ msgstr ""
 "ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง "
 "หรือแฟ้มผิดรูปแบบ)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3020,12 +2217,12 @@ msgstr ""
 "แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ "
 "ของคลังแพกเกจนี้"
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3035,94 +2232,154 @@ msgstr ""
 "ข้อผิดพลาดจาก GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "ไม่สามารถแจงแฟ้ม Release %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
+msgid "List directory %spartial is missing."
+msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial"
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
+msgid "Archives directory %spartial is missing."
+msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
+msgid "Unable to lock directory %s"
+msgstr "ไม่สามารถล็อคไดเรกทอรี %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li (เหลืออีก %s)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ"
+msgid "Retrieving file %li of %li"
+msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน"
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr "ค่า '%s' ไม่สามารถใช้กับ APT::Default-Release ได้ เนื่องจากรุ่นดังกล่าวไม่มีในแหล่ง"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง %s: ไม่มีข้อมูลส่วนหัว 'Package'"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "ไม่เข้าใจชนิดการตรึง %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 apt.conf ที่หัวข้อ "
+"APT::Immediate-Configure (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "ไม่สามารถตั้งค่า '%s'"
+
+#: apt-pkg/packagemanager.cc:577
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"การติดตั้งครั้งนี้จำเป็นต้องลบแพกเกจ %s ชั่วคราว "
+"อันเนื่องมาจากความขัดแย้งหรือความขึ้นต่อกันระหว่างติดตั้งที่เป็นวงรอบ "
+"ซึ่งแพกเกจดังกล่าวเป็นแพกเกจที่จำเป็นสำหรับระบบ การลบดังกล่าวมักเป็นอันตราย "
+"แต่ถ้าคุณต้องการทำเช่นนั้นจริงๆ ก็ให้เปิดตัวเลือก APT::Force-LoopBreak"
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป"
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "กำลังเลิกเมานท์ซีดีรอม...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "กำลังใช้จุดเมานท์ซีดีรอม %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "กำลังเลิกเมานท์ซีดีรอม\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "กำลังรอแผ่น...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "กำลังเมานท์ซีดีรอม...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "กำลังตรวจสอบชื่อแผ่น.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "กำลังตรวจสอบชื่อแผ่น... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "ชื่อที่เก็บไว้: %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "กำลังเลิกเมานท์ซีดีรอม...\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "กำลังสำรวจข้อมูลในแผ่นเพื่อหาแฟ้มดัชนี...\n"
 
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "กำลังสำรวจข้อมูลในแผ่นเพื่อหาแฟ้มดัชนี..\n"
-
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3131,22 +2388,22 @@ msgstr ""
 "พบดัชนีแพกเกจ %zu รายการ, ดัชนีซอร์ส %zu รายการ, ดัชนีคำแปล %zu รายการ และลายเซ็น "
 "%zu รายการ\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr "ไม่พบแฟ้มแพกเกจใดๆ บางทีแผ่นนี้อาจจะไม่ใช่แผ่นเดเบียน หรือสถาปัตยกรรมอาจไม่ถูกต้อง"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "พบชื่อแผ่น '%s'\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "ไม่ใช่ชื่อที่ใช้ได้ กรุณาลองใหม่\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3155,79 +2412,103 @@ msgstr ""
 "แผ่นนี้เรียกชื่อว่า:\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "กำลังคัดลอกรายชื่อแพกเกจ..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "กำลังเขียนรายชื่อแหล่งแพกเกจแหล่งใหม่\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "เขียนแล้ว %i ระเบียน\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย "
+"อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้"
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้"
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "รุ่นแพกเกจที่มี"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "สร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "กำลังอ่านข้อมูลสถานะ"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n"
+msgid "Failed to open StateFile %s"
+msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "ไม่พบระเบียนยืนยันความแท้สำหรับ: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "แฮชไม่ตรงกันสำหรับ: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "ไม่พบรุ่น '%s' ของ '%s'"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "ไม่พบงานติดตั้ง '%s'"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
 
-#: apt-pkg/cacheset.cc:605
-#, fuzzy, c-format
+#: apt-pkg/cacheset.cc:615
+#, c-format
 msgid "Couldn't find any package by glob '%s'"
-msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
+msgstr "ไม่พบแพกเกจที่ตรงกับ glob '%s'"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "ไม่สามารถเลือกรุ่นต่างๆ ของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3235,223 +2516,1004 @@ msgid ""
 msgstr ""
 "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "ไม่สามารถแจงแฟ้ม Release %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "เตรียมรับคำตอบ"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "กำลังเรียก dpkg"
+#: apt-pkg/sourcelist.cc:170
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)"
+
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "กำลังเปิด %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ไม่รู้จักชนิด '%s' ที่วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "กำลังติดตั้ง %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "กำลังตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "กำลังถอดถอน %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "กำลังถอดถอน %s อย่างสมบูรณ์"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "กำลังจดบันทึกการหายไปของ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ไม่มีไดเรกทอรี '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "ไม่สามารถเปิดแฟ้ม '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "กำลังเตรียม %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "กำลังแตกแพกเกจ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "กำลังเตรียมตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "ติดตั้ง %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "กำลังเตรียมถอดถอน %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "ถอดถอน %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
+msgstr "ioctl(TIOCGWINSZ) ล้มเหลว"
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#, c-format
 msgid "Can not write log (%s)"
-msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
+msgstr "ไม่สามารถเขียนปูม (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
-msgstr ""
+msgstr "ได้เมานท์ /dev/pts ไว้หรือไม่?"
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
-msgstr ""
+msgstr "stdout เป็นเทอร์มินัลหรือไม่?"
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า"
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
-msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
+msgstr ""
+"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาของระบบในเครื่อง"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาการอ่าน/เขียนของ dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) คุณเป็น root หรือเปล่า?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรียก '%s' เองเพื่อแก้ปัญหา"
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "ไม่ได้ล็อคอยู่"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liชม. %liนาที %liวิ"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%liนาที %liวิ"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%liวิ"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "ไม่พบรายการเลือก %s"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "ไม่สามารถเปิดแฟ้มล็อค %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "ไม่สามารถล็อค %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "ไม่สามารถสร้างรายชื่อแฟ้มได้ เนื่องจาก '%s' ไม่ใช่ไดเรกทอรี"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่ใช่แฟ้มธรรมดา"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่มีส่วนขยายในชื่อแฟ้ม"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากส่วนขยายในชื่อแฟ้มไม่สามารถใช้การได้"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)"
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u"
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "เกิดปัญหาขณะปิดแฟ้ม gzip %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "ไม่สามารถเปิดแฟ้ม %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "ไม่สามารถเปิด file destriptor %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ"
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "เกิดปัญหาขณะปิดแฟ้ม %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "เกิดปัญหาขณะลบแฟ้ม %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "เกิดปัญหาขณะ sync แฟ้ม"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... ผิดพลาด!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... เสร็จแล้ว"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr "..."
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "ไม่สามารถ mmap แฟ้มเปล่า"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "ไม่สามารถทำซ้ำ file descriptor %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "ไม่สามารถสร้าง mmap ขนาด %llu ไบต์"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "ไม่สามารถปิด mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "ไม่สามารถปรับ mmap ให้ตรงกัน"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "ไม่สามารถตัดท้ายแฟ้ม"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"MMap แบบพลวัตมีเนื้อที่ไม่พอ กรุณาเพิ่มขนาดของ APT::Cache-Start  ค่าปัจจุบัน: %lu (man 5 "
+"apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากถึงขีดจำกัด %lu ไบต์แล้ว"
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากผู้ใช้ปิดการขยายขนาดอัตโนมัติ"
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "ไม่สามารถ stat จุดเมานท์ %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "ไม่สามารถ stat ซีดีรอม"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ"
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, 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:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: directive 'clear' ต้องมีอาร์กิวเมนต์เป็นลำดับชั้นตัวเลือก"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "ไม่รู้จักตัวเลือกบรรทัดคำสั่ง '%c' [จาก %s]"
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "ไม่เข้าใจตัวเลือกบรรทัดคำสั่ง %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "ตัวเลือกบรรทัดคำสั่ง %s ไม่ได้เป็นค่าบูลีน"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "ตัวเลือก %s ต้องมีอาร์กิวเมนต์"
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "ตัวเลือก %s: การกำหนดรายการค่าตั้งต้องมี =<val>"
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "ตัวเลือก %s ต้องการอาร์กิวเมนต์จำนวนเต็ม ไม่ใช่ '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "ตัวเลือก '%s' ยาวเกินไป"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "ไม่เข้าใจค่าบูลีน %s กรุณาลองใช้ true หรือ false"
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "ไม่รู้จักคำสั่ง %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"วิธีใช้: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates เป็นเครื่องมือสำหรับแยกเอาข้อมูลการตั้งค่าและเทมเพลต\n"
+"ออกมาจากแพกเกจเดเบียน\n"
+"\n"
+"ตัวเลือก:\n"
+"  -h   แสดงข้อความช่วยเหลือนี้\n"
+"  -t   กำหนดไดเรกทอรีทำงานชั่วคราว\n"
+"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
+"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "ไม่สามารถ mkstemp %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"วิธีใช้: apt-ftparchive [ตัวเลือก] คำสั่ง\n"
+"คำสั่ง: 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 ใช้สร้างแฟ้มดัชนีสำหรับแหล่งแพกเกจเดเบียน รองรับวิธีสร้างหลายแบบ\n"
+"ตั้งแต่แบบอัตโนมัติทั้งหมด ไปจนถึงการใช้แทน dpkg-scanpackages และ dpkg-scansources\n"
+"\n"
+"apt-ftparchive สร้างแฟ้ม Package จากต้นไม้ไดเรกทอรีที่เก็บ .deb  แฟ้ม Package\n"
+"จะรวมเนื้อหาข้อมูลควบคุมทุกรายการของแต่ละแพกเกจ รวมถึง MD5 hash และขนาดแฟ้ม\n"
+"และรองรับการสร้างแฟ้ม override เพื่อบังคับค่าลำดับความสำคัญและหมวดแพกเกจด้วย\n"
+"\n"
+"ในทำนองเดียวกัน apt-ftparchive จะสร้างแฟ้ม Sources จากต้นไม้ไดเรกทอรีที่เก็บ .dsc\n"
+"คุณสามารถใช้ตัวเลือก --source-override เพื่อระบุแฟ้ม override สำหรับซอร์สได้\n"
+"\n"
+"คำสั่ง 'packages' และ 'sources' ควรเรียกที่ตำแหน่งรากของต้นไม้ไดเรกทอรี\n"
+"ค่า binarypath ควรชี้ไปที่ตำแหน่งฐานที่จะค้นหาแบบทั่วถึง  และแฟ้ม override ก็ควรมีแฟล็ก\n"
+"override ต่างๆ สำหรับแพกเกจ  ค่า pathprefix จะถูกเพิ่มเข้าที่หน้าข้อมูล filename ถ้ามี\n"
+"ตัวอย่างการใช้งานจากแหล่งแพกเกจเดเบียน:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"ตัวเลือก:\n"
+"  -h    แสดงข้อความช่วยเหลือนี้\n"
+"  --md5 ควบคุมการสร้าง MD5\n"
+"  -s=?  แฟ้ม override สำหรับซอร์ส\n"
+"  -q    ทำงานแบบเงียบ\n"
+"  -d=?  เลือกฐานข้อมูลแคชอื่น\n"
+"  --no-delink เปิดโหมดดีบั๊กสำหรับการตัดลิงก์\n"
+"  --contents  ควบคุมการสร้างแฟ้มสารบัญ\n"
+"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
+"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "ไม่มีรายการเลือกที่ตรง"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB เสีย จะเปลี่ยนชื่อแฟ้มเป็น %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่"
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "แพกเกจไม่มีระเบียนควบคุม"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: stat %s ไม่สำเร็จ\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "หาพาธเต็มของ %s ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "เดินท่องต้นไม้ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "เปิด %s ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "readlink %s ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "unlink %s ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s ไม่มีข้อมูล override\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - จองหน่วยความจำไม่สำเร็จ"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "ไม่สามารถเปิด %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu (%s)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "ไม่สามารถอ่านแฟ้ม override %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "ไม่รู้จักอัลกอริทึมบีบอัด '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "ผลลัพธ์ของการบีบอัด %s ต้องมีชุดของการบีบอัดด้วย"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "สร้าง FILE* ไม่สำเร็จ"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "fork ไม่สำเร็จ"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "โพรเซสลูกสำหรับบีบอัด"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "มีปัญหาขณะลบแฟ้ม %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"วิธีใช้: apt-internal-solver\n"
+"\n"
+"apt-internal-solver "
+"เป็นเครื่องมือสำหรับเรียกใช้กลไกภายในปัจจุบันเสมือนเป็นกลไกการแก้ปัญหาภายนอกสำหรับโปรแกรมตระกูล "
+"APT เพื่อการดีบั๊กหรืออะไรทำนองนี้\n"
+"\n"
+"ตัวเลือก:\n"
+"  -h  แสดงข้อความช่วยเหลือนี้\n"
+"  -q  แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n"
+"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
+"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "พบระเบียนแพกเกจที่ไม่รู้จัก!"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"วิธีใช้: apt-sortpkgs [ตัวเลือก] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs เป็นเครื่องมืออย่างง่ายสำหรับเรียงลำดับแฟ้มรายชื่อแพกเกจ ตัวเลือก -s\n"
+"ใช้สำหรับระบุชนิดของแฟ้มที่เรียง\n"
+"\n"
+"ตัวเลือก:\n"
+"  -h   แสดงข้อความช่วยเหลือนี้\n"
+"  -s   เรียงตามแฟ้มซอร์สโค้ด\n"
+"  -c=? อ่านแฟ้มค่าตั้งนี้\n"
+"  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s ไม่ใช่แพกเกจ DEB ที่ใช้การได้"
 
@@ -3603,7 +3665,7 @@ msgstr "ไม่ได้ล็อคอยู่"
 #~ msgstr "ข้อมูลผิดพลาดในแฟ้ม diversion: %s"
 
 #~ msgid "Internal error adding a diversion"
-#~ msgstr "เกิดข้อผิดพลาดภายในขณะเพิ่ม diversion"
+#~ msgstr "เกิดข้อผิดพลาดภายในขณะเพิ่มการเบนแฟ้ม"
 
 #~ msgid "The pkg cache must be initialized first"
 #~ msgstr "ต้องกำหนดค่าตั้งต้นแคชของแพกเกจก่อน"
diff --git a/po/tl.po b/po/tl.po
index 74ca8ec38..6d667fb05 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -20,156 +20,157 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, 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:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Kabuuan ng mga Pakete : "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Kabuuan ng mga Pakete : "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Normal na Pakete: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Purong Birtwual na Pakete: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Nag-iisang Birtwal na Pakete: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Halong Birtwal na Pakete: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Kulang/Nawawala: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Kabuuan ng Natatanging mga Bersyon: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Kabuuan ng Natatanging mga Bersyon: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Kabuuan ng mga Dependensiya: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Kabuuan ng Mapping ng Provides: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Kabuuan ng Globbed String: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Kabuuan ng Hindi Nagamit na puwang: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Kabuuan ng puwang na napag-tuosan: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Wala sa sync ang talaksan ng paketeng %s."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Walang nahanap na mga pakete"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Kailangan niyong magbigay ng isa lamang na pattern"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Talaksang Pakete:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Mga naka-Pin na Pakete:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(hindi nahanap)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Nakaluklok: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Kandidato: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(wala)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Naka-Pin na Pakete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Talaang Bersyon:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, 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:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -245,29 +246,29 @@ msgstr ""
 "Basahin ang pahina ng manwal ng apt-cache(8) at apt.conf(5) para sa \n"
 "karagdagang impormasyon\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set."
 
@@ -303,65 +304,65 @@ msgstr ""
 "  -c=? Basahin itong talaksang pagkaayos\n"
 "  -o=? Itakda ang isang option sa pagkaayos, hal. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Hindi maaldaba ang directory ng download"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 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:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Hindi mahanap ang paketeng source para sa %s"
@@ -381,95 +382,95 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Hindi matantsa ang libreng puwang sa %s"
 
-#: cmdline/apt-get.cc:877
+#: 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Kunin ang Source %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Bigo sa pagkuha ng ilang mga arkibo."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Utos na build '%s' ay bigo.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Bigo ang prosesong anak"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 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:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, 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:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Walang build depends ang %s.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -478,7 +479,7 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -487,14 +488,14 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -503,7 +504,7 @@ 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:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -512,30 +513,30 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Hindi mabuo ang build-dependencies para sa %s."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Bigo sa pagproseso ng build dependencies"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Kumokonekta sa %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -620,53 +621,74 @@ msgstr ""
 "para sa karagdagang impormasyon at mga option.\n"
 "                       Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ngunit ito ay hindi nakaluklok"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ay pinakabagong bersyon na.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ay pinakabagong bersyon na.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Naghintay, para sa %s ngunit wala nito doon"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Bigo ang pagbukas ng %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -693,7 +715,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -741,52 +763,52 @@ msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito."
 msgid "Disk not found."
 msgstr "Hindi nahanap ang Disk."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Hindi Nahanap ang Talaksan"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Bigo ang pag-stat"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Bigo ang pagtakda ng oras ng pagbago"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Di tanggap na URI, mga lokal na URI ay di dapat mag-umpisa ng //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Pumapasok"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Hindi malaman ang pangalan ng peer"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Hindi malaman ang pangalang lokal"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Inayawan ng server ang ating koneksyon at ang sabi ay: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Bigo ang USER/GUMAGAMIT, sabi ng server ay: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Bigo ang PASS, sabi ng server ay: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -794,121 +816,123 @@ msgstr ""
 "May tinakdang katuwang na server ngunit walang login script, walang laman "
 "ang Acquire::ftp::ProxyLogin."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Bigo ang utos sa login script '%s', sabi ng server ay: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Bigo ang TYPE, sabi ng server ay: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Lumipas ang koneksyon"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Sinarhan ng server ang koneksyon"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Error sa pagbasa"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "May sagot na bumubo sa buffer."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Sira ang protocol"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Error sa pagsulat"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Hindi maka-likha ng socket"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Bigo"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Hindi maka-konekta sa socket na passive."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "di makakuha ang getaddrinfo ng socket na nakikinig"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Hindi maka-bind ng socket"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Hindi makarinig sa socket"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Hindi malaman ang pangalan ng socket"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Hindi makapagpadala ng utos na PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Di kilalang pamilya ng address %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Bigo ang EPRT, sabi ng server ay: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Nag-timeout ang socket ng datos"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Hindi makatanggap ng koneksyon"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Problema sa pag-hash ng talaksan"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Nag-timeout ang socket ng datos"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Tanong"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Hindi ma-invoke "
 
@@ -944,7 +968,7 @@ msgstr "Hindi maka-konekta sa %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kumokonekta sa %s"
@@ -974,40 +998,40 @@ 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:166
+#: methods/gpgv.cc:168
 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:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Hindi kilalang error sa pag-execute ng gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1015,119 +1039,353 @@ msgstr ""
 "Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi "
 "available:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Error sa pagsusulat sa talaksan"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Error sa pagbasa mula sa server"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Error sa pagsulat sa talaksan"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Bigo ang pagpili"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Nag-timeout ang koneksyon"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Error sa pagsulat ng talaksang output"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Naghihintay ng panimula"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Maling linyang panimula"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Sira ang range support ng HTTP server na ito"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Di kilalang anyo ng petsa"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Maling datos sa panimula"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Internal na error"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Sinusuri ang pag-upgrade... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Tapos"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Inaayos ang mga dependensiya..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ay bigo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Hindi maayos ang mga dependensiya"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Hindi mai-minimize ang upgrade set"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Tapos"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "ngunit ang %s ay nakaluklok"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ngunit ang %s ay iluluklok"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "ngunit hindi ito maaaring iluklok"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "ngunit ito ay birtwal na pakete"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "ngunit ito ay hindi nakaluklok"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "ngunit ito ay hindi iluluklok"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Ang susunod na mga pakete ay iu-upgrade:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (dahil sa %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
+"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu iniluklok muli, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nai-downgrade, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[O/h]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[o/H]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "O"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "H"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error sa pag-compile ng regex - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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."
+"Nakapagtataka... Hindi magkatugma ang laki, mag-email sa apt@packages.debian."
 "org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Kailangang kumuha ng %sB ng arkibo.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1135,31 +1393,31 @@ msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, 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"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Kulang kayo ng libreng puwang sa %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "May mga problema at -y ay ginamit na walang --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Oo, gawin ang sinasabi ko!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1170,19 +1428,19 @@ msgstr ""
 "Upang magpatuloy, ibigay ang pariralang '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Abort."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Nais niyo bang magpatuloy?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "May mga talaksang hindi nakuha"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1190,19 +1448,19 @@ msgstr ""
 "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o "
 "subukang may --fix-missing?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Hindi maayos ang mga kulang na pakete."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Ina-abort ang pag-instol."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1212,15 +1470,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1236,17 +1494,17 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1256,7 +1514,7 @@ msgid_plural ""
 msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1264,18 +1522,18 @@ msgid_plural ""
 msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 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:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1283,7 +1541,7 @@ msgstr ""
 "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
 "mga pakete (o magtakda ng solusyon)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1294,320 +1552,94 @@ 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."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Sirang mga pakete"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Mga paketeng mungkahi:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Mga paketeng rekomendado:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr ""
 "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Bigo sa pagkuha ng %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "ngunit ang %s ay nakaluklok"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ngunit ang %s ay iluluklok"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "ngunit hindi ito maaaring iluklok"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "ngunit ito ay birtwal na pakete"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "ngunit ito ay hindi nakaluklok"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "ngunit ito ay hindi iluluklok"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Ang susunod na mga pakete ay iu-upgrade:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (dahil sa %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
-"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu iniluklok muli, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nai-downgrade, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[O/h]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[o/H]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "O"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "H"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Error sa pag-compile ng regex - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Inaayos ang mga dependensiya..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " ay bigo."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Hindi maayos ang mga dependensiya"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Hindi mai-minimize ang upgrade set"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Tapos"
-
-#: apt-private/private-cachefile.cc:102
-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."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Sinusuri ang pag-upgrade... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Tapos"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Tumama "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Kunin: "
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "DiPansin "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Nakakuha ng %sB ng %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [May ginagawa]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1620,19 +1652,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Hindi mabasa ang %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Di makalipat sa %s"
@@ -1661,11 +1693,11 @@ msgstr "Hindi mabuksan ang talaksang %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Bigo sa paglikha ng IPC pipe sa subprocess"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Nagsara ng maaga ang koneksyon"
 
@@ -1708,1367 +1740,483 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Pinagsasama ang magagamit na impormasyon"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
-"\n"
-"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n"
-"sa pagkaayos at template mula sa mga paketeng debian\n"
-"\n"
-"Mga opsyon:\n"
-"  -h   Itong tulong na ito\n"
-"  -t   Itakda ang dir na pansamantala\n"
-"  -c=? Basahin ang talaksang pagkaayos na ito\n"
-"  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Hindi makapagsulat sa %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Error sa pagproseso ng directory %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Error sa pagproseso ng Contents %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Pag-gamit: apt-ftparchive [mga option] utos\n"
-"Mga utos: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [mga grupo]\n"
-"          clean config\n"
-"\n"
-"Ang apt-ftparchive ay gumagawa ng talaksang index para sa arkibong Debian.\n"
-"Suportado nito ang maraming estilo ng pagbuo mula sa awtomatikong buo\n"
-"at kapalit ng dpkg-scanpackages at dpkg-scansources\n"
-"\n"
-"Bumubuo ang apt-ftparchive ng mga talaksang Package mula sa puno ng mga\n"
-".deb. Ang talaksang Package ay naglalaman ng laman ng lahat ng control "
-"field\n"
-"mula sa bawat pakete pati na rin ang MD5 hash at laki ng talaksan. "
-"Suportado\n"
-"ang pag-gamit ng talaksang override upang pilitin ang halaga ng Priority at "
-"Section.\n"
-"\n"
-"Bumubuo din ang apt-ftparchive ng talaksang Sources mula sa puno ng mga\n"
-".dsc. Ang option na --source-override ay maaaring gamitin upang itakda\n"
-"ang talaksang override ng src\n"
-"\n"
-"Ang mga utos na 'packages' at 'sources' ay dapat patakbuhin sa ugat ng\n"
-"puno. Kailangan nakaturo ang BinaryPath sa ugat ng paghahanap na recursive\n"
-"at ang talaksang override ay dapat naglalaman ng mga flag na override. Ang\n"
-"pathprefix ay dinudugtong sa harap ng mga pangalan ng talaksan kung "
-"mayroon.\n"
-"Halimbawa ng pag-gamit mula sa arkibong Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Mga option:\n"
-"  -h    Itong tulong na ito\n"
-"  --md5 Pagbuo ng MD5\n"
-"  -s=?  Talaksang override ng source\n"
-"  -q    Tahimik\n"
-"  -d=?  Piliin ang optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Pagbuo ng talaksang contents\n"
-"  -c=?  Basahin itong talaksang pagkaayos\n"
-"  -o=?  Itakda ang isang option na pagkaayos"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Walang mga pinili na tugma"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
-
-#: ftparchive/cachedb.cc:76
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang "
-"bersiyon ng apt, tanggalin at likhain muli ang database."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Hindi mabuksan ang talaksang DB %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Bigo ang pag-stat ng %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Walang kontrol rekord ang arkibo"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Hindi makakuha ng cursor"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Hindi mabasa ang directory %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Hindi ma-stat %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Mga error ay tumutukoy sa talaksang "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Bigo sa pag-resolba ng %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Bigo ang paglakad sa puno"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Bigo ang pagbukas ng %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Bigo ang pagbasa ng link %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Bigo ang pag-unlink ng %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Bigo ang pag-link ng %s sa %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink limit na %sB tinamaan.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Walang field ng pakete ang arkibo"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s ay walang override entry\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Tagapangalaga ng %s ay %s hindi %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ay walang override entry para sa pinagmulan\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s ay wala ring override entry na binary\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Bigo ang pagreserba ng memory"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Hindi mabuksan %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Maling anyo ng override %s linya %lu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Bigo ang pagbasa ng talaksang override %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Maling anyo ng override %s linya %lu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Maling anyo ng override %s linya %lu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Maling anyo ng override %s linya %lu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Hindi kilalang algorithmong compression '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Kailangan ng compression set ang compressed output %s"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Bigo ang paglikha ng FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Bigo ang pag-fork"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Anak para sa pag-Compress"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Error na internal, bigo ang paglikha ng %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Bigo ang IO sa subprocess/talaksan"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Bigo ang pagbasa habang tinutuos ang MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema sa pag-unlink ng %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
-"\n"
-"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n"
-"sa pagkaayos at template mula sa mga paketeng debian\n"
-"\n"
-"Mga opsyon:\n"
-"  -h   Itong tulong na ito\n"
-"  -t   Itakda ang dir na pansamantala\n"
-"  -c=? Basahin ang talaksang pagkaayos na ito\n"
-"  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Di kilalang record ng pakete!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Pag-gamit: apt-sortpkgs [mga option] talaksan1 [talaksan2 ...]\n"
-"\n"
-"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng talaksang "
-"pakete.\n"
-"Ang option -s ay ginagamit upang ipaalam kung anong klaseng talaksan ito.\n"
-"\n"
-"Mga option:\n"
-"  -h   Itong tulong na ito\n"
-"  -s   Gamitin ang pag-sort ng talaksang source\n"
-"  -c=? Basahin ang talaksang pagkaayos na ito\n"
-"  -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Bigo sa paglikha ng mga pipe"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Bigo sa pagtakbo ng gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Sirang arkibo"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Bigo ang checksum ng tar, sira ang arkibo"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Hindi tanggap na signature ng arkibo"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Error sa pagbasa ng header ng miyembro ng arkibo"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Hindi tanggap na header ng miyembro ng arkibo"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Hindi tanggap na header ng miyembro ng arkibo"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Bitin ang arkibo. Sobrang iksi."
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Bigo ang pagbasa ng header ng arkibo"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "Tinawagan ang DropNode sa naka-link pa na node"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Bigo sa paghanap ng elemento ng hash!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Bigo ang pagreserba ng diversion"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Internal error sa AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Sinusubukang patungan ang diversion, %s -> %s at %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dobleng pagdagdag ng diversion %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Nadobleng talaksang conf %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Bigo sa pagsulat ng talaksang %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Bigo sa pagsara ng talaksang %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Sobrang haba ang path na %s"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Binubuklat ang %s ng labis sa isang beses"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Ang directory %s ay divertado"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Ang pakete ay sumusubok na magsulat sa target na diversion %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Sobrang haba ng path na diversion"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Bigo ang pag-stat ng %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Ang directory %s ay papalitan ng hindi-directory"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Bigo ang paghanap ng node sa kanyang hash bucket"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Sobrang haba ng path"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 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:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Hindi ma-stat ang %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Bigo sa pagsulat ng talaksang %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Bigo sa pagsara ng talaksang %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Internal error, hindi mahanap ang miyembrong %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Di maintindihang talaksang control"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Hindi mai-mmap ang talaksang walang laman"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Hindi tanggap na signature ng arkibo"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Hindi makapag-bukas ng pipe para sa %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Error sa pagbasa ng header ng miyembro ng arkibo"
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Hindi makagawa ng mmap ng %lu na byte"
+msgid "Invalid archive member header %s"
+msgstr "Hindi tanggap na header ng miyembro ng arkibo"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Hindi mabuksan %s"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Hindi tanggap na header ng miyembro ng arkibo"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Hindi ma-invoke "
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Bitin ang arkibo. Sobrang iksi."
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Hindi makagawa ng mmap ng %lu na byte"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Bigo ang pagbasa ng header ng arkibo"
 
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Bigo sa pagsulat ng talaksang %s"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Bigo sa paglikha ng mga pipe"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Bigo sa pagtakbo ng gzip "
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Sirang arkibo"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Bigo ang checksum ng tar, sira ang arkibo"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "Hindi ma-stat ang %s"
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%limin %lis"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Piniling %s ay hindi nahanap"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Hindi kilalang katagang uri: '%c'"
-
-#: apt-pkg/contrib/configuration.cc:617
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Binubuksan ang talaksang pagsasaayos %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, 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:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntax error %s:%u: Maling anyo ng Tag"
+msgid "Packaging system '%s' is not supported"
+msgstr "Hindi suportado ang sistema ng paketeng '%s'"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Syntax error %s:%u: May basura matapos ng halaga"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
 
-#: apt-pkg/contrib/configuration.cc:861
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, 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"
+msgid "Wrote %i records.\n"
+msgstr "Nagsulat ng %i na record.\n"
 
-#: apt-pkg/contrib/configuration.cc:868
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntax error %s:%u: Labis ang pagkaka-nest ng mga include"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntax error %s:%u: Sinama mula dito"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Error!"
+"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang "
+"mismatch\n"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Tapos"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Tapos"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Opsyon sa command line %s ay di naintindihan."
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Opsyon sa command line %s ay hindi boolean"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Opsyon %s ay nangangailangan ng argumento"
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
-"=<halaga>."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Opsyon '%s' ay labis ang haba"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Hindi naintindihan ang %s, subukan ang true o false."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Di tanggap na operasyon %s"
+msgid "Hash mismatch for: %s"
+msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Di mai-stat ang mount point %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Bigo sa pag-stat ng cdrom"
+msgid "The method driver %s could not be found."
+msgstr "Ang driver ng paraang %s ay hindi mahanap."
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problema sa pagsara ng talaksan"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-"Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Hindi mabuksan ang talaksang aldaba %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa "
-"nfs"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "hindi makuha ang aldaba %s"
+msgid "Is the package %s installed?"
+msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgid "Method %s did not start correctly"
+msgstr "Hindi umandar ng tama ang paraang %s"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+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/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
+"Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado."
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
+"Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang "
+"ito"
 
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, 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:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Hindi mabuksan ang talaksang %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Hindi makapag-bukas ng pipe para sa %s"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Bigo ang paglikha ng subprocess IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Bigo ang pag-exec ng taga-compress"
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Problema sa pagsara ng talaksan"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problema sa pag-sync ng talaksan"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problema sa pag-unlink ng talaksan"
-
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Problema sa pag-sync ng talaksan"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Ina-abort ang pag-instol."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Walang laman ang cache ng pakete"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Sira ang talaksan ng cache ng pakete"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 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:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Sira ang talaksan ng cache ng pakete"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 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:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Dependensiya"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "PreDepends"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Mungkahi"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Rekomendado"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Tunggali"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Pumapalit"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Linalaos"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "kailangan"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Ginagawa ang puno ng mga dependensiya"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Bersyong Kandidato"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Pagbuo ng Dependensiya"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-#, fuzzy
-msgid "Reading state information"
-msgstr "Pinagsasama ang magagamit na impormasyon"
-
-#: apt-pkg/depcache.cc:244
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Bigo ang pagbukas ng %s"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Bigo sa pagsulat ng talaksang %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Binubuksan %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Hindi mabuksan ang talaksang %s"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Ang takbo ng pag-instol na ito ay nangangailangan ng pansamantalang "
-"pagtanggal ng paketeng esensyal na %s dahil sa isang Conflicts/Pre-Depends "
-"loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-"
-"activate ang APT::Force-LoopBreak na option."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo "
-"para dito."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot "
-"ito ng mga paketeng naka-hold."
-
-#: apt-pkg/algorithms.cc:1070
-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/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Nawawala ang directory ng talaan %spartial."
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Nawawala ang directory ng arkibo %spartial."
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Hindi maaldaba ang directory ng talaan"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Kinukuha ang talaksang %li ng %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ang driver ng paraang %s ay hindi mahanap."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Hindi umandar ng tama ang paraang %s"
-
-#: apt-pkg/acquire-worker.cc:452
-#, 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:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Hindi suportado ang sistema ng paketeng '%s'"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Hindi ma-stat ang %s"
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado."
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang "
-"ito"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-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:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Hindi naintindihan ang uri ng pin %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Hindi akma ang versioning system ng cache"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya."
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Binabasa ang Listahan ng mga Pakete"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Kinukuha ang Talaksang Provides"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Hindi makapagsulat sa %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "IO Error sa pag-imbak ng source cache"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Di tugmang laki"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Di tanggap na operasyon %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Walang public key na magamit para sa sumusunod na key ID:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3076,12 +2224,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3090,12 +2238,12 @@ msgstr ""
 "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
 "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3103,72 +2251,132 @@ msgstr ""
 "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
 "paketeng %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Block ng nagbebenta %s ay walang fingerprint"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
+msgid "List directory %spartial is missing."
+msgstr "Nawawala ang directory ng talaan %spartial."
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Paunawa, pinili ang %s imbes na %s\n"
+msgid "Archives directory %spartial is missing."
+msgstr "Nawawala ang directory ng arkibo %spartial."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Hindi maaldaba ang directory ng talaan"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
+
+#: apt-pkg/acquire.cc:901
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Kinukuha ang talaksang %li ng %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
+"mga luma na lamang."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Di tanggap na linya sa talaksang diversion: %s"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Hindi naintindihan ang uri ng pin %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
+msgid "Could not configure '%s'. "
+msgstr "Hindi mabuksan ang talaksang %s"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Block ng nagbebenta %s ay walang fingerprint"
+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 ""
+"Ang takbo ng pag-instol na ito ay nangangailangan ng pansamantalang "
+"pagtanggal ng paketeng esensyal na %s dahil sa isang Conflicts/Pre-Depends "
+"loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-"
+"activate ang APT::Force-LoopBreak na option."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Ina-unmount ang CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Ginagamit ang %s bilang mount point ng CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Ina-unmount ang CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Hinihintay ang disc...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Sinasalang ang CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Kinikilala..."
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Naka-imbak na Label: %s \n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "Ina-unmount ang CD-ROM..."
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Sinisiyasat ang Disc para sa talaksang index...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3177,22 +2385,22 @@ msgstr ""
 "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na "
 "signature\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "Naka-imbak na Label: %s \n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Hindi yan tanggap na pangalan, subukan muli.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3201,304 +2409,1128 @@ msgstr ""
 "Ang Disc na ito ay nagngangalang: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Kinokopya ang Listahan ng mga Pakete"
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 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:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Nagsulat ng %i na record.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, 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:241 apt-pkg/indexcopy.cc:780
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo "
+"para dito."
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
-"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang "
-"mismatch\n"
+"Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot "
+"ito ng mga paketeng naka-hold."
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
+#: apt-pkg/algorithms.cc:1088
+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/indexcopy.cc:521
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Ginagawa ang puno ng mga dependensiya"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Bersyong Kandidato"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Pagbuo ng Dependensiya"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Pinagsasama ang magagamit na impormasyon"
+
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Di tugmang MD5Sum"
+msgid "Failed to open StateFile %s"
+msgstr "Bigo ang pagbukas ng %s"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Bigo sa pagsulat ng talaksang %s"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/tagfile.cc:140
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
+
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
+
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' para sa '%s' ay hindi nahanap"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Paunawa, pinili ang %s imbes na %s\n"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Di tanggap na linya sa talaksang diversion: %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
+
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
-"mga luma na lamang."
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Binubuksan %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Isasaayos ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Tinatanggal ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Natanggal ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Nawawala ang directory ng talaan %spartial."
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Hinahanda ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Binubuklat ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Hinahanda ang %s upang isaayos"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Naghahanda para sa pagtanggal ng %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Tinanggal ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Natanggal ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Hindi makapagsulat sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Hindi maaldaba ang directory ng talaan"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Piniling %s ay hindi nahanap"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+"Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Hindi mabuksan ang talaksang aldaba %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa "
+"nfs"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "hindi makuha ang aldaba %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, 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:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problema sa pagsara ng talaksan"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Hindi mabuksan ang talaksang %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Hindi makapag-bukas ng pipe para sa %s"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Bigo ang paglikha ng subprocess IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Bigo ang pag-exec ng taga-compress"
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problema sa pagsara ng talaksan"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problema sa pag-sync ng talaksan"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problema sa pag-unlink ng talaksan"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Problema sa pag-sync ng talaksan"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Error!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Tapos"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Tapos"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Hindi mai-mmap ang talaksang walang laman"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Hindi makapag-bukas ng pipe para sa %s"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Hindi makagawa ng mmap ng %lu na byte"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Hindi mabuksan %s"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Hindi ma-invoke "
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Hindi makagawa ng mmap ng %lu na byte"
+
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Bigo sa pagsulat ng talaksang %s"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Di mai-stat ang mount point %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Bigo sa pag-stat ng cdrom"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Hindi kilalang katagang uri: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Binubuksan ang talaksang pagsasaayos %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntax error %s:%u: Maling anyo ng Tag"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, 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:877
+#, 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:884
+#, 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:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntax error %s:%u: Sinama mula dito"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Ina-abort ang pag-instol."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Opsyon sa command line %s ay di naintindihan."
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Opsyon sa command line %s ay hindi boolean"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Opsyon %s ay nangangailangan ng argumento"
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
+"=<halaga>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opsyon '%s' ay labis ang haba"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Hindi naintindihan ang %s, subukan ang true o false."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Di tanggap na operasyon %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
+"\n"
+"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n"
+"sa pagkaayos at template mula sa mga paketeng debian\n"
+"\n"
+"Mga opsyon:\n"
+"  -h   Itong tulong na ito\n"
+"  -t   Itakda ang dir na pansamantala\n"
+"  -c=? Basahin ang talaksang pagkaayos na ito\n"
+"  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Hindi ma-stat ang %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Error sa pagproseso ng directory %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Error sa pagproseso ng Contents %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Pag-gamit: apt-ftparchive [mga option] utos\n"
+"Mga utos: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [mga grupo]\n"
+"          clean config\n"
+"\n"
+"Ang apt-ftparchive ay gumagawa ng talaksang index para sa arkibong Debian.\n"
+"Suportado nito ang maraming estilo ng pagbuo mula sa awtomatikong buo\n"
+"at kapalit ng dpkg-scanpackages at dpkg-scansources\n"
+"\n"
+"Bumubuo ang apt-ftparchive ng mga talaksang Package mula sa puno ng mga\n"
+".deb. Ang talaksang Package ay naglalaman ng laman ng lahat ng control "
+"field\n"
+"mula sa bawat pakete pati na rin ang MD5 hash at laki ng talaksan. "
+"Suportado\n"
+"ang pag-gamit ng talaksang override upang pilitin ang halaga ng Priority at "
+"Section.\n"
+"\n"
+"Bumubuo din ang apt-ftparchive ng talaksang Sources mula sa puno ng mga\n"
+".dsc. Ang option na --source-override ay maaaring gamitin upang itakda\n"
+"ang talaksang override ng src\n"
+"\n"
+"Ang mga utos na 'packages' at 'sources' ay dapat patakbuhin sa ugat ng\n"
+"puno. Kailangan nakaturo ang BinaryPath sa ugat ng paghahanap na recursive\n"
+"at ang talaksang override ay dapat naglalaman ng mga flag na override. Ang\n"
+"pathprefix ay dinudugtong sa harap ng mga pangalan ng talaksan kung "
+"mayroon.\n"
+"Halimbawa ng pag-gamit mula sa arkibong Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Mga option:\n"
+"  -h    Itong tulong na ito\n"
+"  --md5 Pagbuo ng MD5\n"
+"  -s=?  Talaksang override ng source\n"
+"  -q    Tahimik\n"
+"  -d=?  Piliin ang optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Pagbuo ng talaksang contents\n"
+"  -c=?  Basahin itong talaksang pagkaayos\n"
+"  -o=?  Itakda ang isang option na pagkaayos"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Walang mga pinili na tugma"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
+
+#: ftparchive/cachedb.cc:80
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang "
+"bersiyon ng apt, tanggalin at likhain muli ang database."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Hindi mabuksan ang talaksang DB %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Walang kontrol rekord ang arkibo"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Hindi makakuha ng cursor"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Hindi mabasa ang directory %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Hindi ma-stat %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Mga error ay tumutukoy sa talaksang "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Bigo sa pag-resolba ng %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Bigo ang paglakad sa puno"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Bigo ang pagbukas ng %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Bigo ang pagbasa ng link %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Bigo ang pag-unlink ng %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Bigo ang pag-link ng %s sa %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink limit na %sB tinamaan.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Walang field ng pakete ang arkibo"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s ay walang override entry\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  Tagapangalaga ng %s ay %s hindi %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s ay walang override entry para sa pinagmulan\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s ay wala ring override entry na binary\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Bigo ang pagreserba ng memory"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Hindi mabuksan %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Maling anyo ng override %s linya %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Bigo ang pagbasa ng talaksang override %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Maling anyo ng override %s linya %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Maling anyo ng override %s linya %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Maling anyo ng override %s linya %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Hindi kilalang algorithmong compression '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Kailangan ng compression set ang compressed output %s"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Bigo ang paglikha ng FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Bigo ang pag-fork"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Anak para sa pag-Compress"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Error na internal, bigo ang paglikha ng %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Bigo ang IO sa subprocess/talaksan"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Bigo ang pagbasa habang tinutuos ang MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problema sa pag-unlink ng %s"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
+"\n"
+"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n"
+"sa pagkaayos at template mula sa mga paketeng debian\n"
+"\n"
+"Mga opsyon:\n"
+"  -h   Itong tulong na ito\n"
+"  -t   Itakda ang dir na pansamantala\n"
+"  -c=? Basahin ang talaksang pagkaayos na ito\n"
+"  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Di kilalang record ng pakete!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Pag-gamit: apt-sortpkgs [mga option] talaksan1 [talaksan2 ...]\n"
+"\n"
+"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng talaksang "
+"pakete.\n"
+"Ang option -s ay ginagamit upang ipaalam kung anong klaseng talaksan ito.\n"
+"\n"
+"Mga option:\n"
+"  -h   Itong tulong na ito\n"
+"  -s   Gamitin ang pag-sort ng talaksang source\n"
+"  -c=? Basahin ang talaksang pagkaayos na ito\n"
+"  -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s ay hindi balido na paketeng DEB."
 
diff --git a/po/tr.po b/po/tr.po
index 10de5a852..35e324cd2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2013-02-18 03:41+0200\n"
 "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
 "Language-Team: Debian l10n Turkish\n"
@@ -20,154 +20,155 @@ msgstr ""
 "X-Generator: Poedit 1.5.5\n"
 "X-Launchpad-Export-Date: 2013-02-04 12:16+0000\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "%s paketinin (sürüm %s) karşılanamayan bir bağımlılığı var:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Toplam paketlerin adları: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Toplam paket yapıları: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Normal paketler: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Saf sanal paketler: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Tekil sanal paketler: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Karışık sanal paketler: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Eksik: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Toplam farklı sürümler: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Toplam farklı açıklamalar: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Toplam bağımlılıklar: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Toplam sürüm/dosya ilişkileri: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Toplam Tanım/Dosya ilişkileri: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Toplam destekleme eşleştirmeleri: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Toplam birikmiş dizgiler: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Toplam bağlımlık sürümü alanı: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Toplam serbest alan: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Hesaplanan toplam alan: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "%s paket dosyası eşzamansız."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Hiç paket bulunamadı"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "En az bir arama örüntüsü vermelisiniz"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Bu komutun kullanımı bırakılmıştır. Lütfen bunun yerine 'apt-mark showauto' "
 "komutunu kullanın."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%s paketi bulunamadı"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Paket dosyaları:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Önbellek eşzamanlı değil, paket dosyası 'x-ref' yapılamıyor."
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Sabitlenmiş paketler:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(bulunamadı)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Kurulu: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Aday: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Paket sabitleme: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Sürüm çizelgesi:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s (%s için) %s %s tarihinde derlendi\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -239,28 +240,28 @@ msgstr ""
 "Ayrıntılı bilgi için apt-cache(8) ve apt.conf(5) rehber sayfalarına göz "
 "atın.\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Lütfen bu CD/DVD'ye bir isim verin, örneğin 'Debian 5.0.3 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Lütfen sürücüye bir Disk yerleştirin ve giriş tuşuna (Enter) basın"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "'%s', '%s' konumuna bağlanamadı"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Kalan CD'leriniz için bu işlemi yineleyin."
 
@@ -297,47 +298,47 @@ msgstr ""
 "  -o=? İsteğe bağlı ayar seçeneği belirtmenizi sağlar, örneğin -o dir::"
 "cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Kaynak paket olarak '%s' yerine '%s' kullanılacak\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "'%2$s' paketinin mevcut olmayan '%1$s' sürümünü görmezden gel"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s paketi bulunamadı"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s elle kurulmuş olarak ayarlı.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s otomatik olarak kurulmuş şekilde ayarlandı.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -345,19 +346,19 @@ msgstr ""
 "Bu komut artık kullanılmamaktadır. Bunun yerine 'apt-mark auto' ve 'apt-mark "
 "manual' kullanın."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "İç hata, sorun çözücü nesneyi bozdu"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "İndirme dizini kilitlenemiyor"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "Kaynağının indirileceği en az bir paket seçilmeli"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s paketinin kaynak paketi bulunamadı"
@@ -384,78 +385,78 @@ msgstr ""
 "bzr branch %s\n"
 "komutunu kullanın.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s içindeki boş alan miktarı belirlenemedi"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s üzerinde yeterli boş alan yok"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB/%sB kaynak arşivi indirilecek.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB kaynak arşivi indirilecek.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s kaynağını al\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Bazı arşivler alınamadı."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s için zaten açılmış bazı paketlerin açılması atlanıyor.\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Paket açma komutu '%s' başarısız.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "İnşa komutu '%s' başarısız oldu.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Alt süreç başarısız"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr "İnşa bağımlılıklarının denetleneceği en az bir paket belirtilmedilir"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -464,17 +465,17 @@ msgstr ""
 "%s mimarisine uygun mimari bilgileri mevcut değil. Kurulumu için apt.conf(5) "
 "rehber sayfasındaki APT::Architectures kısmına göz atın."
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s paketinin inşa-bağımlılığı bilgisi alınamıyor"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s paketinin hiç inşa bağımlılığı yok.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -483,7 +484,7 @@ msgstr ""
 "'%4$s' paketlerinde %3$s paketine izin verilmediği için %2$s kaynağının %1$s "
 "bağımlılığı karşılanamıyor."
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -491,12 +492,12 @@ msgid ""
 msgstr ""
 "%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı."
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%2$s için %1$s bağımlılığı karşılanamadı: Kurulu %3$s paketi çok yeni."
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -505,7 +506,7 @@ msgstr ""
 "%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü "
 "gerekli sürüm şartlarını karşılamıyor"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,30 +514,30 @@ msgid ""
 msgstr ""
 "%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü yok"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s için %1$s bağımlılığı karşılanamadı: %3$s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s için inşa bağımlılıkları karşılanamadı."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "İnşa bağımlılıklarını işleme başarısız oldu"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) paketinin değişim günlüğü"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Desteklenen birimler:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -626,53 +627,74 @@ msgstr ""
 "sayfalarına bakabilirsiniz.\n"
 "                       Bu APT'nin Süper İnek Güçleri vardır.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Kaynağının indirileceği en az bir paket seçilmeli"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s kurulu olmadığı için işaretlenemedi.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s zaten elle kurulmuş olarak ayarlı.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s zaten otomatik kurulmuş olarak ayarlı.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s zaten tutulacak şekilde ayarlanmış.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s için beklenildi ama o gelmedi"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s paketi tutuluyor.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s paketini tutma işlemi iptal edildi.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "'dpkg' çalıştırılamadı. root olduğunuzdan emin misiniz?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -719,7 +741,7 @@ msgstr ""
 "Ayrıntılı bilgi için apt-mark(8) ve apt.conf(5) rehber sayfalarına\n"
 "bakabilirsiniz."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -767,52 +789,52 @@ msgstr "%s konumundaki CD-ROM çıkarılamıyor, hala kullanımda olabilir."
 msgid "Disk not found."
 msgstr "Disk bulunamadı."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Dosya bulunamadı"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Durum bilgisi okunamadı"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Değişiklik zamanı ayarlanamadı"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Geçersiz URI, yerel URI'ler // ile başlamamalıdır"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Giriş yapılıyor"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Eş adı belirlenemiyor"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Yerel ad belirlenemiyor"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Sunucu bağlantıyı reddetti, sunucunun iletisi: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER başarısız, sunucunun iletisi: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS başarısız, sunucunun iletisi: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -820,121 +842,123 @@ msgstr ""
 "Bir Vekil sunucu belirtildi ancak oturum açma betiği belirtilmedi, Acquire::"
 "ftp::ProxyLogin boş."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Oturum açma betiği komutu '%s' başarısız oldu, sunucunun iletisi: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE başarısız, sunucunun iletisi: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Bağlantı zaman aşımına uğradı"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Sunucu bağlantıyı kesti"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Okuma hatası"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Bir yanıt arabelleği taşırdı."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "İletişim kuralları bozulması"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Yazma hatası"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Bir soket oluşturulamadı"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Veri soketine bağlanılamadı, bağlantı zaman aşımına uğradı"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Başarısız"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Edilgen sokete bağlanılamadı."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo bir dinleme soketi alamıyor"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Bir sokete bağlanılamadı"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Soket dinlenemedi"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Soketin adı belirlenemedi"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "PORT komutu gönderilemedi"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Bilinmeyen adres ailesi %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT başarısız, sunucunun iletisi: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Veri soketi bağlantısı zaman aşımına uğradı"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Bağlantı kabul edilemiyor"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Dosya sağlaması yapılamadı"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Dosya alınamıyor, sunucunun iletisi: '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Veri soketi zaman aşımına uğradı"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Veri aktarımı başarısız, sunucunun iletisi: '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Sorgu"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Çağrılamıyor "
 
@@ -970,7 +994,7 @@ msgstr "Adrese bağlanılamadı: %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Bağlanılıyor: %s"
@@ -1000,186 +1024,422 @@ msgstr "'%s:%s' (%i - %s) adresi çözümlenirken bir şeyler kötü gitti"
 msgid "Unable to connect to %s:%s:"
 msgstr "Bağlanılamıyor %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "İç hata: İmza iyi, ancak anahtar parmak izi belirlenemedi?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "En az bir geçersiz imza ile karşılaşıldı."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "İmza doğrulama için 'gpgv' çalıştırılamadı (gpgv kurulu mu?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "gpgv çalıştırılırken bilinmeyen hata"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Aşağıdaki imzalar geçersiz:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "Aşağıdaki imzalar doğrulanamadı, çünkü genel anahtar mevcut değil:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Dosyaya yazılamadı"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Sunucundan okunurken hata. Uzak sonlu kapalı bağlantı"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Sunucundan okunurken hata"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Dosyaya yazılamadı"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Seçme başarısız"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Bağlantı zaman aşımına uğradı"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Çıktı dosyasına yazılırken hata"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Başlıklar bekleniyor"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Kötü başlık satırı"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP sunucusu geçersiz bir cevap başlığı gönderdi"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP sunucusu geçersiz bir Content-Length başlığı gönderdi"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP sunucusu geçersiz bir Content-Range başlığı gönderdi"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "HTTP sunucusunun aralık desteği bozuk"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Bilinmeyen tarih biçimi"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Kötü başlık verisi"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Bağlantı başarısız"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "İç hata"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Yükseltme hesaplanıyor... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "İç hata, AllUpgrade bazı şeyleri bozdu"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Bitti"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Bağımlılıklar düzeltiliyor..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " başarısız oldu."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Bağımlılıklar düzeltilemedi"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Yükseltme kümesi küçültülemiyor"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Tamamlandı"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
+"gerekebilir."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Kuruldu]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Kuruldu]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Kuruldu]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Kuruldu]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "ama %s kurulu"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ama %s kurulacak"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "ama kurulabilir değil"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "ama o bir sanal paket"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "ama kurulu değil"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "ama kurulmayacak"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " ya da"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Aşağıdaki YENİ paketler kurulacak:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Aşağıdaki paketler KALDIRILACAK:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Aşağıdaki paketler yükseltilecek:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s nedeniyle) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"UYARI: Aşağıdaki temel paketler kaldırılacak.\n"
+"Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu paket yeniden kurulacak, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu paketin sürümü düşürülecek, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[E/h]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[e/H]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "E"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "H"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex derleme hatası - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "'update' komutu bağımsız değişken almamaktadır"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Paketlerin kaldırılması gerekiyor ancak kaldırma işlemi devre dışı "
 "bırakılmış."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "İç hata, Sıralama tamamlanamadı"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
-"Ne kadar ilginç.. Boyutlar eşleşmedi, apt@packages.debian.org adresine "
+"Ne kadar ilginç... Boyutlar eşleşmedi, apt@packages.debian.org adresine "
 "eposta atın."
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%sB/%sB arşiv dosyası indirilecek.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%sB arşiv dosyası indirilecek.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Bu işlem tamamlandıktan sonra %sB ek disk alanı kullanılacak.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Bu işlem tamamlandıktan sonra %sB disk alanı boşalacak.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s içinde yeterli boş alanınız yok."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Bazı sorunlar çıktı ve -y seçeneği, --force-yes olmadan kullanıldı"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Yalnızca Önemsiz seçeneği ayarlandı, fakat bu önemsiz bir işlem bir değil."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Evet, söylediğim şekilde yap!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1190,19 +1450,19 @@ msgstr ""
 "Devam etmek için '%s' ifadesini yazınız\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Vazgeç."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Devam etmek istiyor musunuz?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Bazı dosyalar indirilemedi"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1210,19 +1470,19 @@ msgstr ""
 "Bazı arşivler alınamıyor, apt-get update'i çalıştırmayı ya da --fix-missing "
 "seçeneğini ekleyerek düzeltmeyi deneyin."
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing seçeneği ve ortam takası şu an için desteklenmiyor"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Eksik paketler düzeltilemedi."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Kurulum iptal ediliyor."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1236,15 +1496,15 @@ msgstr[1] ""
 "Tüm dosyalarının üzerine yazıldığı için aşağıdaki paketler\n"
 "sisteminizden kayboldu:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Not: Bu eylem dpkg tarafından otomatik ve kasıtlı olarak yapılmıştır."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nesneleri silmemiz beklenemez, AutoRemover çalıştırılamıyor"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1262,15 +1522,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Aşağıdaki bilgiler durumu çözmenize yardımcı olabilir:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "İç hata, AutoRemover bazı şeyleri bozdu"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1282,7 +1542,7 @@ msgstr[1] ""
 "Aşağıdaki paketler otomatik olarak kurulmuş ve artık bu paketlere gerek "
 "duyulmuyor:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1290,19 +1550,19 @@ msgid_plural ""
 msgstr[0] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
 msgstr[1] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Bu paketi kaldırmak için 'apt-get autoremove' komutunu kullanın."
 msgstr[1] "Bu paketleri kaldırmak için 'apt-get autoremove' komutunu kullanın."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Bunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
 "gerekebilir:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1310,7 +1570,7 @@ msgstr ""
 "Karşılanmamış bağımlılıklar. 'apt-get -f install' komutunu paket seçeneği "
 "vermeden deneyin (ya da bir çözüm belirtin)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1322,324 +1582,96 @@ msgstr ""
 "bazı paketlerin henüz oluşturulamamış  ya da oluşturulmakta\n"
 "olduğunu gösterir."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Bozuk paketler"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Aşağıdaki ek paketler de kurulacak:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Önerilen paketler:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Tavsiye edilen paketler:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"NOT: Bu sadece simülasyondur!\n"
+"      apt-get sadece root hakları ile gerçekten kullanılabilir.\n"
+"      Unutmayın ki simülasyonda kilitleme yapılmaz,\n"
+"      bu nedenle bu simülasyonun tam uygunluğuna güvenmeyin."
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Bazı paketlerin kimlik denetimi yapılamadı"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Paketler doğrulanmadan kurulsun mu?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s ağdan alınamadı. %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Kuruldu]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Kuruldu]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Kuruldu]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Kuruldu]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "ama %s kurulu"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ama %s kurulacak"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "ama kurulabilir değil"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "ama o bir sanal paket"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "ama kurulu değil"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "ama kurulmayacak"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " ya da"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Aşağıdaki YENİ paketler kurulacak:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Aşağıdaki paketler KALDIRILACAK:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Aşağıdaki paketler yükseltilecek:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s nedeniyle) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"UYARI: Aşağıdaki temel paketler kaldırılacak.\n"
-"Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu paket yeniden kurulacak, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu paketin sürümü düşürülecek, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[E/h]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[e/H]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "E"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "H"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex derleme hatası - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Bağımlılıklar düzeltiliyor..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " başarısız oldu."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Bağımlılıklar düzeltilemedi"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Yükseltme kümesi küçültülemiyor"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Tamamlandı"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
-"gerekebilir."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "'update' komutu bağımsız değişken almamaktadır"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Yükseltme hesaplanıyor... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "İç hata, AllUpgrade bazı şeyleri bozdu"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Bitti"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"NOT: Bu sadece simülasyondur!\n"
-"      apt-get sadece root hakları ile gerçekten kullanılabilir.\n"
-"      Unutmayın ki simülasyonda kilitleme yapılmaz,\n"
-"      bu nedenle bu simülasyonun tam uygunluğuna güvenmeyin."
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "%s, %s olarak yeniden adlandırılamadı"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Bağlandı  "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Alınıyor: "
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Yoksay    "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Hata      "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%2$s'de %1$sB alındı (%3$sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Çalışıyor]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1652,19 +1684,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s okunamıyor"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s olarak değiştirilemedi"
@@ -1693,11 +1725,11 @@ msgstr "Yansı dosyası %s okunamıyor"
 msgid "[Mirror: %s]"
 msgstr "[Yansı: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Altsürece IPC borusu oluşturulamadı"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Bağlantı vaktinden önce kapandı"
 
@@ -1740,1347 +1772,447 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Kullanılabilir bilgiler birleştiriliyor"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Kullanım: apt-extracttemplates dosya1 [dosya2 ...]\n"
-"\n"
-"apt-extracttemplates, Debian paketlerinden ayar ve şablon bilgisini\n"
-"almak için kullanılan bir araçtır\n"
-"\n"
-"Seçenekler:\n"
-"  -h   Bu yardım dosyası\n"
-"  -t   Geçici dizini ayarlar\n"
-"  -c=? Belirtilen ayar dosyasını kullanır\n"
-"  -o=? Ayar seçeneği belirtmeyi sağlar, ör -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s dosyasına yazılamıyor"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "debconf sürümü alınamıyor. debconf kurulu mu?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Paket uzantı listesi çok uzun"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "%s dizinini işlemede hata"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Kaynak uzantı listesi çok uzun"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "İçindekiler dosyasına üstbilgi yazmada hata"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "%s içeriğini işlemede hata"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Kullanım: apt-ftparchive [seçenekler] komut\n"
-"Komutlar: packages ikilikonumu [geçersizkılmadosyası [konumöneki]]\n"
-"          sources kaynakkonumu [geçersizkılmadosyası [konumöneki]]\n"
-"          contents konum\n"
-"          release konum\n"
-"          generate yapılandırma [gruplar]\n"
-"          clean yapılandırma\n"
-"\n"
-"apt-ftparchive Debian arşivleri için indeks dosyaları üretir. \n"
-"dpkg-scanpackages ve dpkg-scansources için tamamen otomatikten\n"
-"işlevsel yedeklere kadar birçok üretim çeşidini destekler.\n"
-"\n"
-"apt-ftparchive, .deb dizinlerinden 'Package' dosyaları üretir. 'Package'\n"
-"dosyası, her paketin MD5 doğrulama ve dosya büyüklüğü gibi denetim\n"
-"alanlarının bilgilerini içerir. Öncelik (Priority) ve bölüm (Section)\n"
-"değerlerini istenen başka değerlerle değiştirebilmek için bir geçersiz\n"
-"kılma dosyası kullanılabilir.\n"
-"\n"
-"Benzer şekilde, apt-ftparchive, .dscs dosyalarından 'Sources' dosyaları\n"
-"üretir. '--source-override' seçeneği bir src geçersiz kılma dosyası\n"
-"belirtmek için kullanıabilir.\n"
-"\n"
-"'packages' ve 'sources' komutları dizin ağacının kökünde çalıştırıl-\n"
-"malıdır. BinaryPath özyineli aramanın temeline işaret etmeli ve\n"
-"geçersiz kılma dosyası geçersiz kılma bayraklarını içermelidir.\n"
-"Pathprefix mevcutsa dosya adı alanlarının sonuna eklenir. Debian\n"
-"arşivinden örnek kullanım şu şekildedir:\n"
-"\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Seçenekler:\n"
-"  -h    Bu yardım metni\n"
-"  --md5 MD5 üretimini denetle\n"
-"  -s=?  Kaynak geçersiz kılma dosyası\n"
-"  -q    Sessiz\n"
-"  -d=?  Seçimlik önbellek veritabanını seç\n"
-"  --no-delink Bağlantılanmamış hata ayıklama kipini etkinleştir\n"
-"  --contents  İçerik dosyası üretimini denetle\n"
-"  -c=?  Belirtilen yapılandırma dosyası kullan\n"
-"  -o=?  Yapılandırma seçeneği ayarla"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Hiçbir seçim eşleşmedi"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Veritabanı bozuk, dosya adı %s.old olarak değiştirildi"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Veritabanı eski, %s yükseltilmeye çalışılıyor"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Veritabanı biçimi geçersiz. Eğer apt'ın eski bir sürümünden yükseltme "
-"yaptıysanız, lütfen veritabanını silin ve yeniden oluşturun."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Veritabanı dosyası %s açılamadı: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%s durum bilgisi alınamadı"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Arşivin denetim kaydı yok"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "İmleç alınamıyor"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: %s dizini okunamıyor\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: %s durum bilgisi alınamıyor\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "E: Hatalar şu dosya için geçerli: "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s çözümlenemedi"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Ağaçta gezinme başarısız"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s açılamadı"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "%s bağlantı okuması başarılamadı"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "%s bağlantı koparma başarılamadı"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s, %s konumuna bağlanamadı"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " %sB'lik bağlantı koparma (DeLink) sınırına ulaşıldı.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Arşivde paket alanı yok"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s için geçersiz kılma girdisi yok\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s geliştiricisi %s, %s değil\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  '%s' paketinin yerine geçecek bir kaynak paket yok\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  '%s' paketinin yerine geçecek bir ikili paket de yok\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Bellek ayırma yapılamadı"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s açılamıyor"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Hatalı geçersiz kılma %s satır %llu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Geçersiz kılma dosyası %s okunamadı"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Hatalı geçersiz kılma %s satır %llu #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Hatalı geçersiz kılma %s satır %llu #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Hatalı geçersiz kılma %s satır %llu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Bilinmeyen sıkıştırma algoritması '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Sıkıştırılmış %s çıktısı bir sıkıştırma kümesine ihtiyaç duymaktadır."
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "DOSYA* oluşturulamadı"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "fork yapılamadı"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Çocuğu sıkıştır"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "İç hata, %s oluşturulamadı"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "MD5 hesaplanırken okunamadı"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "%s bağı koparılırken sorun çıktı"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "%s, %s olarak yeniden adlandırılamadı"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Kullanım: apt-internal-solver\n"
-"\n"
-"apt-internal-solver mevcut dahili çözücüyü (hata ayıklama\n"
-"gibi sebeplerle) harici çözücü gibi kullanmaya yarayan bir\n"
-"arayüzdür.\n"
-"\n"
-"Seçenekler:\n"
-"  -h  Bu yardım metni.\n"
-"  -q  Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n"
-"  -c=? Belirtilen yapılandırma dosyası kullan\n"
-"  -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Bilinmeyen paket kaydı!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Kullanım: apt-sortpkgs [seçenekler] dosya1 [dosya2 ...]\n"
-"\n"
-"apt-sortpkgs, paket dosyalarını sıralayan basit bir araçtır.\n"
-"-s seçeneği ne tür bir dosya olduğunu göstermekte kullanılır.\n"
-"\n"
-"Seçenekler:\n"
-"  -h Bu yardım metni\n"
-"  -s Kaynak dosyası sıralamayı kullan\n"
-"  -c=? Belirtilen yapılandırma dosyasını oku\n"
-"  -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/"
-"tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Boru oluşturulamadı"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Gzip çalıştırılamadı "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Bozuk arşiv"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Bilinmeyen TAR başlığı türü %u, üye %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Geçersiz arşiv imzası"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Arşiv üyesi başlığı okuma hatası"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Geçerşiz arşiv üyesi başlığı %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Geçersiz arşiv üyesi başlığı"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arşiv çok kısa"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Arşiv başlıkları okunamadı"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode hala bağlı olan düğüm üzerinde çağrıldı"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Sağlama elementi bulunamadı"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "Yönlendirme tahsisi başarısız oldu"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "AddDiversion'da iç hata"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Bir yönlendirmenin üzerine yazılmaya çalışılıyor, %s -> %s ve %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "%s/%s yapılandırma dosyası zaten mevcut"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "%s dosyasına yazılamadı"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "%s dosyası kapatılamadı"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "%s yolu çok uzun"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s paketi bir çok kez açıldı"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "%s dizini yönlendirilmiş"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Bu paket yönlendirme hedefine (%s/%s) yazmayı deniyor"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Yönlendirme yolu çok uzun"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s durum bilgisi alınamadı"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s, %s olarak yeniden adlandırılamadı"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "%s dizini dizin olmayan bir öğeyle değiştirildi"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "Düğüm sağlama kovasında bulunamadı"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Yol çok uzun"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "%s paketinin sürümü yok"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "%s/%s dosyası %s paketindeki aynı adlı dosyanın üzerine yazmak istiyor"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s durum bilgisi alınamadı"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "%s dosyasına yazılamadı"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "%s dosyası kapatılamadı"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Bu dosya geçerli bir DEB arşivi değil, '%s' üyesi eksik"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "İç hata, %s üyesi bulunamadı"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Ayrıştırılamayan 'control' dosyası"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Boş dosya mmap yapılamıyor"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Dosya tanımlayıcı %i çoğaltılamadı"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "%llu baytlık mmap yapılamaz"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "mmap kapatılamıyor"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "mmap eşlenemiyor"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "%lu baytlık mmap yapılamaz"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Dosya kesilemedi"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Dinamik MMap yerine sığamadı. Lütfen APT::Cache-Start boyutunu artırın. "
-"Kullanımdaki değer: %lu (ayrıntılı bilgi için man 5 apt.conf komutunu "
-"kullanın)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr "%lu baytlık sınıra ulaşıldığı için MMap boyutu artırılamadı."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Otomatik büyüme kullanıcı tarafından kapatıldığı için MMap boyutu "
-"artırılamadı."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li gün %li saat %li dk. %li sn."
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li saat %li dk. %li sn."
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%li dk. %li sn."
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%li sn."
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s seçimi bulunamadı"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Tanınamayan tür kısaltması: '%c'"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Geçersiz arşiv imzası"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Yapılandırma dosyası (%s) açılıyor"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Arşiv üyesi başlığı okuma hatası"
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Sözdizim hatası %s:%u: Blok ad olmadan başlıyor."
+msgid "Invalid archive member header %s"
+msgstr "Geçerşiz arşiv üyesi başlığı %s"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Sözdizim hatası %s:%u: Kötü biçimlendirilmiş etiket"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Geçersiz arşiv üyesi başlığı"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Sözdizim hatası %s:%u: Değerden sonra ilave gereksiz"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arşiv çok kısa"
 
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "Sözdizim hatası %s:%u: Yönergeler yalnızca en üst düzeyde bitebilir"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Arşiv başlıkları okunamadı"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Sözdizim hatası %s:%u: Çok fazla yuvalanmış 'include'"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Boru oluşturulamadı"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Sözdizim hatası %s:%u: Buradan 'include' edilmiş"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Gzip çalıştırılamadı "
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Sözdizim hatası %s:%u: Desteklenmeyen yönerge '%s'"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Bozuk arşiv"
 
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Sözdizim hatası %s:%u: clear yönergesi argüman olarak bir seçenek ağacı "
-"gerektirir."
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Sözdizim hatası %s:%u: Dosya sonunda ilave gereksiz"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Bilinmeyen TAR başlığı türü %u, üye %s"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Hata!"
+msgid "Unable to stat %s."
+msgstr "%s için dosya bilgisi alınamadı."
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Bitti"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Bitti"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Komut satırı seçeneği '%c' [%s içinden] tanınmıyor."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Komut satırı seçeneği %s anlaşılamadı"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Komut satırı seçeneği %s mantıksal değer değil"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "%s seçeneği bir bağımsız değişkene gerek duyar."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-"%s seçeneği: Yapılandırma öğesi tanımlaması =<değer> şeklinde değer "
-"içermelidir."
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "dpkg çalıştırılıyor"
 
-#: apt-pkg/contrib/cmndline.cc:273
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "%s seçeneği bir tam sayı bağımsız değişkene gerek duyar, '%s' değil"
+msgid "Packaging system '%s' is not supported"
+msgstr "Paketleme sistemi '%s' desteklenmiyor"
 
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "'%s' seçeneği çok uzun"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Uygun bir paketleme sistemi türü bulunamıyor"
 
-#: apt-pkg/contrib/cmndline.cc:336
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "%s algılaması anlaşılamadı, true (doğru) ya da false (yanlış) deneyin."
+msgid "Wrote %i records.\n"
+msgstr "%i kayıt yazıldı.\n"
 
-#: apt-pkg/contrib/cmndline.cc:386
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Invalid operation %s"
-msgstr "Geçersiz işlem: %s"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%2$i eksik dosyayla %1$i kayıt yazıldı.\n"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Bağlama noktasının (%s) durum bilgisi alınamadı"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Cdrom durum bilgisi alınamadı"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%2$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n"
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Gzip dosyası %s kapatılamadı"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "%2$i eksik dosya ve %3$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n"
 
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Kilitleme dosyası %s salt okunur olduğu için kilitleme kullanılmıyor"
+msgid "Can't find authentication record for: %s"
+msgstr "%s için kimlik doğrulama kaydı bulunamadı."
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open lock file %s"
-msgstr "Kilit dosyası %s açılamadı"
+msgid "Hash mismatch for: %s"
+msgstr "Sağlama yapılamadı: %s"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "nfs ile bağlanmış kilit dosyası %s için kilitleme kullanılmıyor"
+msgid "The method driver %s could not be found."
+msgstr "Yöntem sürücüsü %s bulunamadı."
 
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "%s kilidi alınamadı"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "'%s' dizin olmadığı için dosya listeli oluşturulamıyor"
+msgid "Method %s did not start correctly"
+msgstr "%s yöntemi düzgün şekilde başlamadı"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"'%2$s' dizinindeki '%1$s' normal bir dosya olmadığı için görmezden geliniyor."
+"Lütfen '%s' olarak etiketlenmiş diski '%s' sürücüsüne yerleştirin ve giriş "
+"(enter) tuşuna basın."
 
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-"'%2$s' dizinindeki '%1$s' dosyası uzantısı olmadığı için görmezden geliniyor."
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Paket listeleri ya da durum dosyası ayrıştırılamadı ya da açılamadı."
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
-"'%2$s' dizinindeki '%1$s' dosyası geçersiz bir dosya uzantısı olduğu için "
-"yok sayılıyor."
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "%s altsüreci bir bölümleme hatası aldı (segmentation fault)."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "%s altsüreci %u sinyali aldı"
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "%s altsüreci bir hata kodu gönderdi (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "%s altsüreci beklenmeyen bir şekilde sona erdi"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "%s dosyası açılamadı"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Dosya tanımlayıcı %d açılamadı"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Altsüreç IPC'si oluşturulamadı"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Sıkıştırma programı çalıştırılamadı "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "read, %llu bayt okunması gerekli fakat hiç kalmamış"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "write, yazılması gereken %llu bayt yazılamıyor"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "%s dosyası kapatılamadı"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "%s dosyası %s olarak yeniden adlandırılamadı"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "%s dosyasından bağ kaldırma sorunu"
-
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Dosya eşitlenirken sorun çıktı"
+"Bu sorunları gidermek için apt-get update komutunu çalıştırabilirsiniz."
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s dizininde kurulu bir anahtar yok."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Kaynak listesi okunamadı."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Boş paket önbelleği"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Paket önbelleği dosyası bozulmuş"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Paket önbelleği dosyası uyumsuz bir sürümde"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Paket önbellek dosyası bozulmuş, çok küçük"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Bu APT '%s' sürümleme sistemini desteklemiyor."
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Paket önbelleği farklı bir mimarı için yapılmış"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Bağımlılıklar"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "ÖnBağımlılıklar"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Önerdikleri"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Tavsiye ettikleri"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Çakışmalar"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Değiştirilenler"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Eskiyenler"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Bozdukları"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Geliştirdikleri"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "önemli"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "gerekli"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "standart"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "seçimlik"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "ilave"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Bağımlılık ağacı oluşturuluyor"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Aday sürümler"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Bağımlılık oluşturma"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Durum bilgisi okunuyor"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Durum dosyası (StateFile) %s açılamadı."
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Paket dosyası %s ayrıştırılamadı (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Paket dosyası %s ayrıştırılamadı (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr ""
-"Kaynak listesinin (%2$s)  %1$lu numaralı satırı hatalı (URI ayrıştırma)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] "
-"ayrıştırılamıyor)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama "
-"değil)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin "
-"anahtarı yok)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s "
-"anahtarına değer atanmamış)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
-"Kaynak listesinin (%2$s)  %1$lu numaralı satırı hatalı (URI ayrıştırma)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "%s Açılıyor"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"\"%s\" paketinin anında yapılandırması başarısız oldu. Ayrıntılar için apt."
-"conf(5) rehber sayfasının APT::Immediate-Configure kısmına bakın. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "'%s' paketi yapılandırılamadı. "
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Bu kurulum, bir Çakışma/Ön-Bağımlılık döngüsü içerdiği için %s temel "
-"paketinin geçici olarak kaldırılmasını gerektiriyor. Bu durum genellikle "
-"kötü bir durumdur, ama ille de devam etmek isterseniz, APT::Force-LoopBreak "
-"seçeneğini etkinleştirin."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "İndeks dosyası türü '%s' desteklenmiyor"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"%s paketinin tekrar kurulması gerekli, ancak gereken arşiv dosyası "
-"bulunamıyor."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Hata, pkgProblemResolver::Resolve bozuk paketlere yol açtı, bu sorunun "
-"nedeni tutulan paketler olabilir."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Liste dizini %spartial bulunamadı."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arşiv dizini %spartial bulunamadı."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "%s dizini kilitlenemiyor"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Alınan dosya: %li / %li (%s kaldı)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Alınan dosya: %li / %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Yöntem sürücüsü %s bulunamadı."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s yöntemi düzgün şekilde başlamadı"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Lütfen '%s' olarak etiketlenmiş diski '%s' sürücüsüne yerleştirin ve giriş "
-"(enter) tuşuna basın."
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Paketleme sistemi '%s' desteklenmiyor"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Uygun bir paketleme sistemi türü bulunamıyor"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s için dosya bilgisi alınamadı."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "'sources.list' dosyası içine bazı 'source' adresleri koymalısınız."
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Paket listeleri ya da durum dosyası ayrıştırılamadı ya da açılamadı."
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Bu sorunları gidermek için apt-get update komutunu çalıştırabilirsiniz."
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Kaynak listesi okunamadı."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"APT::Default-Release için '%s' değeri geçersizdir, çünkü kaynaklarda böyle "
-"bir sürüm yok."
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "%s tercihler dosyasında geçersiz kayıt, Paket başlığı yok"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "İğne türü %s anlaşılamadı"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "İğne için öncelik belirlenmedi (ya da sıfır)"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Önbelleğin uyumsuz bir sürümleme sistemi var"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "%s paketi işlenirken sorunlarla karşılaşıldı (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Vay canına, bu APT'nin alabileceği paket adları sayısını aştınız."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Vay canına, bu APT'nin alabileceği sürüm sayısını aştınız."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Vay canına, bu APT'nin alabileceği açıklama sayısını aştınız."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Vay canına, bu APT'nin alabileceği bağımlılık sayısını aştınız."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Dosya bağımlılıkları işlenirken %s %s paketi bulunamadı"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Paket listeleri okunuyor"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Dosya Sağlananları Toplanıyor"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s dosyasına yazılamıyor"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Çözücüye senaryo gönder"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Çözücüye istek gönder"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Çözüm almak için hazırlan"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Harici çözücüyü çalıştır"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "yeniden adlandırma başarısız, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Sağlama toplamları eşleşmiyor"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Boyutlar eşleşmiyor"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Geçersiz işlem: %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3089,17 +2221,17 @@ msgstr ""
 "'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list "
 "dosyasındaki girdi ya da satır hatalı)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3108,12 +2240,12 @@ msgstr ""
 "%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun "
 "güncelleştirmeleri uygulanmayacak."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3123,12 +2255,12 @@ msgstr ""
 "indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG hatası: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3137,82 +2269,146 @@ msgstr ""
 "%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle "
 "düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Paket indeks dosyaları bozuk. %s paketinin 'Filename:' alanı yok."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "'Release' dosyası (%s) ayrıştırılamadı"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Sağlayıcı bloğu %s parmak izi içermiyor"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "'Release' dosyası %s içinde hiç bölüm yok"
+msgid "List directory %spartial is missing."
+msgstr "Liste dizini %spartial bulunamadı."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "'Release' dosyasında (%s) sağlama girdisi yok"
+msgid "Archives directory %spartial is missing."
+msgstr "Arşiv dizini %spartial bulunamadı."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "'Release' dosyasında (%s) geçersiz 'Valid-Until' girdisi"
+msgid "Unable to lock directory %s"
+msgstr "%s dizini kilitlenemiyor"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Alınan dosya: %li / %li (%s kaldı)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Sağlayıcı bloğu %s parmak izi içermiyor"
+msgid "Retrieving file %li of %li"
+msgstr "Alınan dosya: %li / %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Bazı indeks dosyaları indirilemedi. Bu dosyalar yok sayıldılar ya da önceki "
+"sürümleri kullanıldı."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "'sources.list' dosyası içine bazı 'source' adresleri koymalısınız."
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"APT::Default-Release için '%s' değeri geçersizdir, çünkü kaynaklarda böyle "
+"bir sürüm yok."
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "%s tercihler dosyasında geçersiz kayıt, Paket başlığı yok"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "İğne türü %s anlaşılamadı"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "İğne için öncelik belirlenmedi (ya da sıfır)"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"\"%s\" paketinin anında yapılandırması başarısız oldu. Ayrıntılar için apt."
+"conf(5) rehber sayfasının APT::Immediate-Configure kısmına bakın. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "'%s' paketi yapılandırılamadı. "
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Bu kurulum, bir Çakışma/Ön-Bağımlılık döngüsü içerdiği için %s temel "
+"paketinin geçici olarak kaldırılmasını gerektiriyor. Bu durum genellikle "
+"kötü bir durumdur, ama ille de devam etmek isterseniz, APT::Force-LoopBreak "
+"seçeneğini etkinleştirin."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM ayrılıyor...\n"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "CD-ROM bağlama noktası %s kullanılıyor\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "CD-ROM ayrılıyor\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Disk bekleniliyor...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "CD-ROM bağlanıyor...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Tanımlanıyor... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Kayıtlı etiket: %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM ayrılıyor...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "Disk, indeks dosyaları için taranıyor..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "Disk, indeks dosyaları için taranıyor...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3221,7 +2417,7 @@ msgstr ""
 "%zu paket indeksi, %zu kaynak indeksi, %zu çeviri indeksi ve %zu imza "
 "bulundu\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3229,16 +2425,16 @@ msgstr ""
 "Hiç paket dosyası bulunamadı. Belirttiğiniz disk bir Debian diski değil ya "
 "da yanlış mimariye sahip."
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "'%s' etiketi bulundu\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Bu, geçerli bir ad değil, yeniden deneyin.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3247,79 +2443,105 @@ msgstr ""
 "Disk adı: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Paket listeleri kopyalanıyor.."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Yeni kaynak listesi yazılıyor\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Bu disk için olan kaynak listesi girdileri:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i kayıt yazıldı.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"%s paketinin tekrar kurulması gerekli, ancak gereken arşiv dosyası "
+"bulunamıyor."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%2$i eksik dosyayla %1$i kayıt yazıldı.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Hata, pkgProblemResolver::Resolve bozuk paketlere yol açtı, bu sorunun "
+"nedeni tutulan paketler olabilir."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bağımlılık ağacı oluşturuluyor"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Aday sürümler"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Bağımlılık oluşturma"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Durum bilgisi okunuyor"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%2$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n"
+msgid "Failed to open StateFile %s"
+msgstr "Durum dosyası (StateFile) %s açılamadı."
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "%2$i eksik dosya ve %3$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "%s için kimlik doğrulama kaydı bulunamadı."
+msgid "Unable to parse package file %s (1)"
+msgstr "Paket dosyası %s ayrıştırılamadı (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Sağlama yapılamadı: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Paket dosyası %s ayrıştırılamadı (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "'%s' görevi bulunamadı"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "'%s' paketi tamamen sanal olduğu için sürümü seçilemiyor"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3328,171 +2550,246 @@ msgstr ""
 "'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de "
 "seçilemiyor"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "'%s' paketi sanal olduğu için en yeni sürümü seçilemiyor"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "'%s' paketinin aday sürümü olmadığı için aday sürüm seçilemiyor"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "'%s' paketi kurulu olmadığı için kurulu sürüm seçilemiyor"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Çözücüye senaryo gönder"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "'Release' dosyası (%s) ayrıştırılamadı"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Çözücüye istek gönder"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "'Release' dosyası %s içinde hiç bölüm yok"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Çözüm almak için hazırlan"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "'Release' dosyasında (%s) sağlama girdisi yok"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "'Release' dosyasında (%s) geçersiz 'Valid-Until' girdisi"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Harici çözücüyü çalıştır"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
+"Kaynak listesinin (%2$s)  %1$lu numaralı satırı hatalı (URI ayrıştırma)"
+
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] "
+"ayrıştırılamıyor)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "dpkg çalıştırılıyor"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
-"Bazı indeks dosyaları indirilemedi. Bu dosyalar yok sayıldılar ya da önceki "
-"sürümleri kullanıldı."
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama "
+"değil)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin "
+"anahtarı yok)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s "
+"anahtarına değer atanmamış)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr ""
+"Kaynak listesinin (%2$s)  %1$lu numaralı satırı hatalı (URI ayrıştırma)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s Açılıyor"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "%s kuruluyor"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "%s yapılandırılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "%s kaldırılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s tamamen kaldırılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s paketinin kaybolduğu not ediliyor"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' dizini bulunamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "'%s' dosyası açılamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "%s hazırlanıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s paketi açılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s paketini yapılandırmaya hazırlanılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "%s kuruldu"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s paketinin kaldırılmasına hazırlanılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "%s kaldırıldı"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s tamamen kaldırıldı"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "%s dosyasına yazılamıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "İşlem yarıda kesildi"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3500,14 +2797,14 @@ msgstr ""
 "Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan "
 "kaynaklanan bir hata olduğunu belirtiyor."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3515,7 +2812,7 @@ msgstr ""
 "Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport "
 "raporu yazılamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3523,14 +2820,14 @@ msgid ""
 msgstr ""
 "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Hata iletisi bir dpkg G/Ç hatasına işaret ettiği için apport raporu "
 "yazılamadı"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3539,24 +2836,760 @@ msgstr ""
 "Yönetim dizini (%s) kilitlenemiyor, başka bir işlem tarafından kullanılıyor "
 "olmasın?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Yönetim dizini (%s) kilitlenemiyor, root kullanıcısı mısınız?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg kesintiye uğradı, sorunu düzeltmek için elle '%s' komutunu çalıştırın. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Kilitlenmemiş"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li gün %li saat %li dk. %li sn."
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li saat %li dk. %li sn."
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li dk. %li sn."
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li sn."
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s seçimi bulunamadı"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Kilitleme dosyası %s salt okunur olduğu için kilitleme kullanılmıyor"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Kilit dosyası %s açılamadı"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "nfs ile bağlanmış kilit dosyası %s için kilitleme kullanılmıyor"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "%s kilidi alınamadı"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "'%s' dizin olmadığı için dosya listeli oluşturulamıyor"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+"'%2$s' dizinindeki '%1$s' normal bir dosya olmadığı için görmezden geliniyor."
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+"'%2$s' dizinindeki '%1$s' dosyası uzantısı olmadığı için görmezden geliniyor."
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"'%2$s' dizinindeki '%1$s' dosyası geçersiz bir dosya uzantısı olduğu için "
+"yok sayılıyor."
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "%s altsüreci bir bölümleme hatası aldı (segmentation fault)."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "%s altsüreci %u sinyali aldı"
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "%s altsüreci bir hata kodu gönderdi (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "%s altsüreci beklenmeyen bir şekilde sona erdi"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Gzip dosyası %s kapatılamadı"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "%s dosyası açılamadı"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Dosya tanımlayıcı %d açılamadı"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Altsüreç IPC'si oluşturulamadı"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Sıkıştırma programı çalıştırılamadı "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "read, %llu bayt okunması gerekli fakat hiç kalmamış"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "write, yazılması gereken %llu bayt yazılamıyor"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "%s dosyası kapatılamadı"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "%s dosyası %s olarak yeniden adlandırılamadı"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "%s dosyasından bağ kaldırma sorunu"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Dosya eşitlenirken sorun çıktı"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Hata!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Bitti"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Bitti"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Boş dosya mmap yapılamıyor"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Dosya tanımlayıcı %i çoğaltılamadı"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "%llu baytlık mmap yapılamaz"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "mmap kapatılamıyor"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "mmap eşlenemiyor"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "%lu baytlık mmap yapılamaz"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Dosya kesilemedi"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dinamik MMap yerine sığamadı. Lütfen APT::Cache-Start boyutunu artırın. "
+"Kullanımdaki değer: %lu (ayrıntılı bilgi için man 5 apt.conf komutunu "
+"kullanın)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr "%lu baytlık sınıra ulaşıldığı için MMap boyutu artırılamadı."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Otomatik büyüme kullanıcı tarafından kapatıldığı için MMap boyutu "
+"artırılamadı."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Bağlama noktasının (%s) durum bilgisi alınamadı"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Cdrom durum bilgisi alınamadı"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Tanınamayan tür kısaltması: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Yapılandırma dosyası (%s) açılıyor"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Sözdizim hatası %s:%u: Blok ad olmadan başlıyor."
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Sözdizim hatası %s:%u: Kötü biçimlendirilmiş etiket"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Sözdizim hatası %s:%u: Değerden sonra ilave gereksiz"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "Sözdizim hatası %s:%u: Yönergeler yalnızca en üst düzeyde bitebilir"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Sözdizim hatası %s:%u: Çok fazla yuvalanmış 'include'"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Sözdizim hatası %s:%u: Buradan 'include' edilmiş"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Sözdizim hatası %s:%u: Desteklenmeyen yönerge '%s'"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Sözdizim hatası %s:%u: clear yönergesi argüman olarak bir seçenek ağacı "
+"gerektirir."
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Sözdizim hatası %s:%u: Dosya sonunda ilave gereksiz"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s dizininde kurulu bir anahtar yok."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Komut satırı seçeneği '%c' [%s içinden] tanınmıyor."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Komut satırı seçeneği %s anlaşılamadı"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Komut satırı seçeneği %s mantıksal değer değil"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "%s seçeneği bir bağımsız değişkene gerek duyar."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"%s seçeneği: Yapılandırma öğesi tanımlaması =<değer> şeklinde değer "
+"içermelidir."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "%s seçeneği bir tam sayı bağımsız değişkene gerek duyar, '%s' değil"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "'%s' seçeneği çok uzun"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "%s algılaması anlaşılamadı, true (doğru) ya da false (yanlış) deneyin."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Geçersiz işlem: %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Kullanım: apt-extracttemplates dosya1 [dosya2 ...]\n"
+"\n"
+"apt-extracttemplates, Debian paketlerinden ayar ve şablon bilgisini\n"
+"almak için kullanılan bir araçtır\n"
+"\n"
+"Seçenekler:\n"
+"  -h   Bu yardım dosyası\n"
+"  -t   Geçici dizini ayarlar\n"
+"  -c=? Belirtilen ayar dosyasını kullanır\n"
+"  -o=? Ayar seçeneği belirtmeyi sağlar, ör -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s durum bilgisi alınamadı"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "debconf sürümü alınamıyor. debconf kurulu mu?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Paket uzantı listesi çok uzun"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "%s dizinini işlemede hata"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Kaynak uzantı listesi çok uzun"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "İçindekiler dosyasına üstbilgi yazmada hata"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "%s içeriğini işlemede hata"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Kullanım: apt-ftparchive [seçenekler] komut\n"
+"Komutlar: packages ikilikonumu [geçersizkılmadosyası [konumöneki]]\n"
+"          sources kaynakkonumu [geçersizkılmadosyası [konumöneki]]\n"
+"          contents konum\n"
+"          release konum\n"
+"          generate yapılandırma [gruplar]\n"
+"          clean yapılandırma\n"
+"\n"
+"apt-ftparchive Debian arşivleri için indeks dosyaları üretir. \n"
+"dpkg-scanpackages ve dpkg-scansources için tamamen otomatikten\n"
+"işlevsel yedeklere kadar birçok üretim çeşidini destekler.\n"
+"\n"
+"apt-ftparchive, .deb dizinlerinden 'Package' dosyaları üretir. 'Package'\n"
+"dosyası, her paketin MD5 doğrulama ve dosya büyüklüğü gibi denetim\n"
+"alanlarının bilgilerini içerir. Öncelik (Priority) ve bölüm (Section)\n"
+"değerlerini istenen başka değerlerle değiştirebilmek için bir geçersiz\n"
+"kılma dosyası kullanılabilir.\n"
+"\n"
+"Benzer şekilde, apt-ftparchive, .dscs dosyalarından 'Sources' dosyaları\n"
+"üretir. '--source-override' seçeneği bir src geçersiz kılma dosyası\n"
+"belirtmek için kullanıabilir.\n"
+"\n"
+"'packages' ve 'sources' komutları dizin ağacının kökünde çalıştırıl-\n"
+"malıdır. BinaryPath özyineli aramanın temeline işaret etmeli ve\n"
+"geçersiz kılma dosyası geçersiz kılma bayraklarını içermelidir.\n"
+"Pathprefix mevcutsa dosya adı alanlarının sonuna eklenir. Debian\n"
+"arşivinden örnek kullanım şu şekildedir:\n"
+"\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Seçenekler:\n"
+"  -h    Bu yardım metni\n"
+"  --md5 MD5 üretimini denetle\n"
+"  -s=?  Kaynak geçersiz kılma dosyası\n"
+"  -q    Sessiz\n"
+"  -d=?  Seçimlik önbellek veritabanını seç\n"
+"  --no-delink Bağlantılanmamış hata ayıklama kipini etkinleştir\n"
+"  --contents  İçerik dosyası üretimini denetle\n"
+"  -c=?  Belirtilen yapılandırma dosyası kullan\n"
+"  -o=?  Yapılandırma seçeneği ayarla"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Hiçbir seçim eşleşmedi"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Veritabanı bozuk, dosya adı %s.old olarak değiştirildi"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Veritabanı eski, %s yükseltilmeye çalışılıyor"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Veritabanı biçimi geçersiz. Eğer apt'ın eski bir sürümünden yükseltme "
+"yaptıysanız, lütfen veritabanını silin ve yeniden oluşturun."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Veritabanı dosyası %s açılamadı: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Arşivin denetim kaydı yok"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "İmleç alınamıyor"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: %s dizini okunamıyor\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: %s durum bilgisi alınamıyor\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "E: Hatalar şu dosya için geçerli: "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "%s çözümlenemedi"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Ağaçta gezinme başarısız"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s açılamadı"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "%s bağlantı okuması başarılamadı"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "%s bağlantı koparma başarılamadı"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s, %s konumuna bağlanamadı"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " %sB'lik bağlantı koparma (DeLink) sınırına ulaşıldı.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Arşivde paket alanı yok"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s için geçersiz kılma girdisi yok\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s geliştiricisi %s, %s değil\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  '%s' paketinin yerine geçecek bir kaynak paket yok\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  '%s' paketinin yerine geçecek bir ikili paket de yok\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Bellek ayırma yapılamadı"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s açılamıyor"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Hatalı geçersiz kılma %s satır %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Geçersiz kılma dosyası %s okunamadı"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Hatalı geçersiz kılma %s satır %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Hatalı geçersiz kılma %s satır %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Hatalı geçersiz kılma %s satır %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Bilinmeyen sıkıştırma algoritması '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Sıkıştırılmış %s çıktısı bir sıkıştırma kümesine ihtiyaç duymaktadır."
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "DOSYA* oluşturulamadı"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "fork yapılamadı"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Çocuğu sıkıştır"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "İç hata, %s oluşturulamadı"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "MD5 hesaplanırken okunamadı"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "%s bağı koparılırken sorun çıktı"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Kullanım: apt-internal-solver\n"
+"\n"
+"apt-internal-solver mevcut dahili çözücüyü (hata ayıklama\n"
+"gibi sebeplerle) harici çözücü gibi kullanmaya yarayan bir\n"
+"arayüzdür.\n"
+"\n"
+"Seçenekler:\n"
+"  -h  Bu yardım metni.\n"
+"  -q  Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n"
+"  -c=? Belirtilen yapılandırma dosyası kullan\n"
+"  -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Bilinmeyen paket kaydı!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Kullanım: apt-sortpkgs [seçenekler] dosya1 [dosya2 ...]\n"
+"\n"
+"apt-sortpkgs, paket dosyalarını sıralayan basit bir araçtır.\n"
+"-s seçeneği ne tür bir dosya olduğunu göstermekte kullanılır.\n"
+"\n"
+"Seçenekler:\n"
+"  -h Bu yardım metni\n"
+"  -s Kaynak dosyası sıralamayı kullan\n"
+"  -c=? Belirtilen yapılandırma dosyasını oku\n"
+"  -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/"
+"tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s geçerli bir DEB paketi değil."
 
diff --git a/po/uk.po b/po/uk.po
index 957743d91..39ed660f7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-all\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2012-09-25 20:19+0300\n"
 "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Українська <uk@li.org>\n"
@@ -24,155 +24,156 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Пакунок %s версії %s має незадоволену залежність:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Всього імен пакунків: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Всього структур пакунків: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Нормальних пакунків: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Цілком віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Окремих віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Змішаних віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Відсутні: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Всього унікальних версій: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Всього унікальних описів: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Всього залежностей: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Всього відносин Версія/Файл: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Всього відносин Опис/Файл: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total Provides mappings: "
 msgstr "Всього карт 'Provides': "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Всього відфільтрованих (globbed) рядків: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 #, fuzzy
 msgid "Total dependency version space: "
 msgstr "Всього інформації про залежності: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 #, fuzzy
 msgid "Total slack space: "
 msgstr "Порожнього місця в кеші: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Загальний простір полічений для: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Перелік пакунків %s розсинхронізований."
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Не знайдено жодного пакунка"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Ви повинні задати не менше одного шаблону пошуку"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Ця команда є застарілою. Будь-ласка використовуйте 'apt-mark showauto'"
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Не можу знайти пакунок %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Переліки пакунків:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Кеш не синхронізований, неможливо знайти посилання на перелік пакунків"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Зафіксовані пакунки:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(не знайдено)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Встановлено: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(відсутній)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Фіксатор(pin) пакунка: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Таблиця версій:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s для %s скомпільовано %s %s\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -242,28 +243,28 @@ msgstr ""
 "  -o=? Встановити умовну опцію конфігурації, наприклад, -o dir::cache=/tmp\n"
 "Дивіться подробиці на man-сторінках apt-cache(8) і apt.conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Задайте назву для цього Диска, наприклад 'Debian 5.0.3 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Будь-ласка, вставте Диск у пристрій і натисніть Enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Не вдалося під'єднати '%s' до '%s'"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Повторіть цей процес для решти CD з вашого набору."
 
@@ -299,47 +300,47 @@ msgstr ""
 "   -с=? Читати зазначений конфігураційний файл.\n"
 "   -o=? Встановити умовну опцію, наприклад, -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Обираю '%s' як пакунок вихідних текстів, замість '%s'\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Ігнорувати недоступну версію '%s' пакунку '%s'"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не можу знайти пакунок %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s позначений як встановлений вручну.\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s позначений як автоматично встановлений.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -347,21 +348,21 @@ msgstr ""
 "Ця команда застаріла. Будь-ласка, використовуйте замість неї 'apt-mark auto' "
 "і 'apt-mark manual'."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутрішня помилка, вирішувач проблем щось поламав"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Неможливо заблокувати директорію для завантаження"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
 "тексти"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
@@ -386,81 +387,81 @@ msgstr ""
 "bzr branch %s\n"
 "щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаємо вже завантажений файл '%s'\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не вдалося визначити кількість вільного місця в %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Недостатньо місця в %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Завантаження вихідних текстів %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Деякі архіви не вдалося завантажити."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Завантаження завершено в режимі \"тільки завантаження\""
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда розпакування '%s' завершилася невдало.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда побудови '%s' закінчилася невдало.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Породжений процес завершився невдало"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для перевірки залежностей для побудови необхідно вказати як мінімум один "
 "пакунок"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -469,17 +470,17 @@ msgstr ""
 "Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::"
 "Архітектури для налащтування"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Неможливо одержати інформацію про залежності для побудови %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не має залежностей для побудови.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -488,7 +489,7 @@ msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на "
 "'%s' пакунках"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,14 +497,14 @@ msgid ""
 msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s "
 "новіше, аніж треба"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -512,7 +513,7 @@ msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо версія пакунку-"
 "кандидата %s не задовольняє умови по версіям"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,30 +522,30 @@ msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо немає пакунку-"
 "кандидата %s потрібної версії"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Залежності для побудови %s не можуть бути задоволені."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Обробка залежностей для побудови закінчилася невдало"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Журнал змін для %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Підтримувані модулі:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -636,53 +637,76 @@ msgstr ""
 "містять більше інформації і опцій.\n"
 "                       Цей APT має Супер-Коров'ячу Силу.\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
+"тексти"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s не може бути позначений, тому що він не встановлений.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s вже був позначений, як встановлений вручну.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s вже був позначений, як автоматично встановлений.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s вже був зафіксований.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s вже був незафіксований.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Очікував на %s, але його там не було"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s зафіксовано.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Фіксацію для %s відмінено.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Не вдалося виконати dpkg. Ви root?"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 #, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -729,7 +753,7 @@ msgstr ""
 "  -o=? Встановити умовну опцію конфігурації, наприклад, -o dir::cache=/tmp\n"
 "Для докладної інформації дивіться керівництва для apt-mark(8) і apt.conf(5)."
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -778,53 +802,53 @@ msgstr ""
 msgid "Disk not found."
 msgstr "Диск не знайдено."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Файл не знайдено"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 #, fuzzy
 msgid "Failed to stat"
 msgstr "Не вдалося одержати атрибути (stat)"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Не вдалося встановити час модифікації"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Невірне посилання (URI), локальні посилання не повинні починатися з //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Логінюсь в"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Неможливо визначити назву вузла"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Неможливо визначити локальну назву"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Сервер розірвав з'єднання, відповівши: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -832,121 +856,123 @@ msgstr ""
 "Вказано проксі-сервер, але відсутній скрипт логіну, Acquire::ftp::ProxyLogin "
 "пустий."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Команда '%s' у скрипті логіна не вдалася, сервер мовив: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Час з'єднання вичерпався"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Сервер закрив з'єднання"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Помилка зчитування"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Відповідь переповнила буфер."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Спотворений протокол"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Помилка запису"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Неможливо створити сокет (socket)"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Невдача"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Неможливо під'єднати пасивний сокет (passive socket)."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Виклик getaddrinfo не зміг отримати слухаючий сокет"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "Неможливо приєднатися до сокета"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Неможливо прослухати на сокеті"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Не вдалося визначити назву сокета"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Неможливо відіслати команду PORT"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Невідоме адресове сімейство %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Час з'єднання з сокетом даних вичерпався"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Неможливо прийняти з'єднання"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Проблема хешування файла"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Неможливо завантажити файл, сервер мовив: '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Час з'єднання з сокетом (socket) з даними вичерпався"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Передача даних обірвалася, сервер мовив '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Черга"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Неможливо викликати "
 
@@ -982,7 +1008,7 @@ msgstr "Неможливо під'єднатися до %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "З'єднання з %s"
@@ -1012,38 +1038,38 @@ msgstr "Сталося щось дивне при спробі отримати
 msgid "Unable to connect to %s:%s:"
 msgstr "Неможливо під'єднатися до %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
 "відбиток?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "Знайдено як мінімум один невірний підпис."
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Неможливо виконати 'gpgv' для перевірки підпису (чи встановлено gpgv?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Невідома помилка виконання gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Наступні підписи були невірними:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1051,117 +1077,354 @@ msgstr ""
 "Наступні підписи не можуть бути перевірені, тому що публічний ключ "
 "відсутній:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Пусті файли не можуть бути правильними архівами"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Помилка запису у файл"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Помилка зчитування з сервера"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Помилка запису у файл"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Вибір провалився"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Час очікування з'єднання вийшов"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Помилка запису у вихідний файл"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Очікування на заголовки"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Невірний рядок заголовку"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP сервер відіслав невірний заголовок 'reply'"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP сервер відіслав невірний заголовок 'Content-Range'"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Цей HTTP сервер має поламану підтримку 'range'"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Невідомий формат дати"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Погана заголовкова інформація"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "З'єднання не вдалося"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Обчислення оновлень... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Внутрішня помилка, AllUpgrade щось поламав"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Виконано"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Виправлення залежностей..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " невдача."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Неможливо скоригувати залежності"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Неможливо мінімізувати набір оновлень"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Виконано"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Незадоволені залежності. Спробуйте використати -f."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакунки, що мають незадоволені залежності:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "але %s вже встановлений"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "але %s буде встановлений"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "але він не може бути встановлений"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "але це віртуальний пакунок"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "але він не встановлений"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "але він не буде встановлений"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " чи"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "НОВІ пакунки, які будуть встановлені:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Пакунки, які залишені в незмінному стані:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (внаслідок %s) "
+
+#: apt-private/private-output.cc:662
+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"
+"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "оновлено %lu, встановлено %lu нових, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu перевстановлено, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu замінено на старіші версії, "
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu відмічено для видалення і %lu не оновлено.\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "не встановлено(видалено) до кінця %lu пакунків.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Помилка компіляції регулярного виразу - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Команді update не потрібні аргументи"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Внутрішня помилка, InstallPackages була викликана з непрацездатними "
 "пакунками!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Необхідно видалити пакунки, але видалення заборонене."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутрішня помилка, Ordering не завершилася"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "Дивно.. Розбіжність розмірів, напишіть на apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "Дивно... Розбіжність розмірів, напишіть на apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Необхідно завантажити %sB/%sB архівів.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Необхідно завантажити %sB архівів.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1169,33 +1432,33 @@ msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 "Після цієї операції об'єм зайнятого дискового простору зменшиться на %sB.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Недостатньо вільного місця в %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Виявлено проблеми, а опція -y була використана без --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Вказано виконання тільки тривіальних операцій, але це не тривіальна операція."
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Так, робити, як я скажу!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1206,19 +1469,19 @@ msgstr ""
 "Щоб продовжити, введіть фразу: '%s'\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Перервано."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Бажаєте продовжити?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Деякі файли не вдалося завантажити"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1226,19 +1489,19 @@ msgstr ""
 "Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update "
 "або спробувати повторити запуск з ключем --fix-missing?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing і зміна носія в даний момент не підтримується"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Неможливо виправити втрачені пакунки."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Переривається встановлення."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1255,15 +1518,15 @@ msgstr[2] ""
 "Вказані пакунки зникли з вашої системи, так як\n"
 "усі файли були перезаписані іншими пакунками:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Увага: це зроблено автоматично і умисно dpkg'ем."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Нам не дозволено видаляти, неможливо запустити AutoRemover"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1281,15 +1544,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Наступна інформація можливо допоможе Вам виправити ситуацію:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутрішня Помилка, AutoRemover щось поламав"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1300,7 +1563,7 @@ msgstr[0] ""
 msgstr[1] "Наступні пакунки були встановлені автоматично і більше не потрібні:"
 msgstr[2] "Наступні пакунки були встановлені автоматично і більше не потрібні:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1311,20 +1574,20 @@ msgstr[1] ""
 msgstr[2] ""
 "%lu пакунків було встановлено автоматично і вони більше не потрібні.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Використовуйте 'apt-get autoremove' щоб видалити його."
 msgstr[1] "Використовуйте 'apt-get autoremove' щоб видалити їх."
 msgstr[2] "Використовуйте 'apt-get autoremove' щоб видалити їх."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
 "install':"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1332,7 +1595,7 @@ msgstr ""
 "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
 "вказуючи назв пакунків (або вкажіть рішення)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1343,324 +1606,96 @@ msgstr ""
 "або ж використовуєте нестабільний дистрибутив, і запитані Вами пакунки\n"
 "ще не створені або були вилучені з Incoming."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Зламані пакунки"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Будуть встановлені наступні додаткові пакунки:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Пропоновані пакунки:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Рекомендовані пакунки:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"УВАГА: Це тільки симуляція!\n"
+"       apt-get потребує права root для реального запуску.\n"
+"       Також не забувайте, що блокування вимикається,\n"
+"       тому не очікуйте на відповідність поточній реальній ситуації!"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Автентифікаційне попередження не прийнято до уваги.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Деякі пакунки неможливо автентифікувати"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Встановити ці пакунки без перевірки?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Не вдалося завантажити %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакунки, що мають незадоволені залежності:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "але %s вже встановлений"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "але %s буде встановлений"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "але він не може бути встановлений"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "але це віртуальний пакунок"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "але він не встановлений"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "але він не буде встановлений"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " чи"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "НОВІ пакунки, які будуть встановлені:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Пакунки, які залишені в незмінному стані:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (внаслідок %s) "
-
-#: apt-private/private-output.cc:631
-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"
-"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "оновлено %lu, встановлено %lu нових, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu перевстановлено, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu замінено на старіші версії, "
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu відмічено для видалення і %lu не оновлено.\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "не встановлено(видалено) до кінця %lu пакунків.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Помилка компіляції регулярного виразу - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Виправлення залежностей..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " невдача."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Неможливо скоригувати залежності"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Неможливо мінімізувати набір оновлень"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Виконано"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Незадоволені залежності. Спробуйте використати -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Команді update не потрібні аргументи"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Обчислення оновлень... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Внутрішня помилка, AllUpgrade щось поламав"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Виконано"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"УВАГА: Це тільки симуляція!\n"
-"       apt-get потребує права root для реального запуску.\n"
-"       Також не забувайте, що блокування вимикається,\n"
-"       тому не очікуйте на відповідність поточній реальній ситуації!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Не вдалося перейменувати %s на %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "В кеші "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Отр:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Ігн "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Пом "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Отримано %sB за %sB (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Йде робота]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1673,19 +1708,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Неможливо прочитати %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Неможливо змінити на %s"
@@ -1714,11 +1749,11 @@ msgstr "Неможливо прочитати файл дзеркала '%s'"
 msgid "[Mirror: %s]"
 msgstr "[Дзеркало: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Не вдалося створити IPC канал для підпроцесу"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "З'єднання завершено передчасно"
 
@@ -1761,1349 +1796,456 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Об'єднання доступної інформації"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Використання: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n"
-"і файли-шаблони\n"
-"\n"
-"Опції:\n"
-"  -h   Цей текст\n"
-"  -t   Встановити директорію для тимчасових файлів\n"
-"  -c=? Читати зазначений конфігураційний файл\n"
-"  -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Неможливо записати в %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Неможливо визначити версію debconf. Він встановлений?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Список розширень, припустимих для пакунків, занадто довгий"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Помилка обробки директорії %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr ""
-"Список розширень, припустимих для пакунків з вихідними текстами, занадто "
-"довгий"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Помилка обробки повного переліку вмісту пакунків (Contents) %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Використання: apt-ftparchive [параметри] команда\n"
-"Команди:  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 генерує індексні файли архівів Debian. Він підтримує\n"
-"безліч стилів генерації: від повністю автоматичного до функціональної "
-"заміни\n"
-"програм dpkg-scanpackages і dpkg-scansources\n"
-"\n"
-"apt-ftparchive генерує файли Package (переліки пакунків) для дерева\n"
-"тек, що містять файли .deb. Файл Package містить у собі керуючі\n"
-"поля кожного пакунка, а також хеш MD5 і розмір файлу. Значення керуючих\n"
-"полів \"пріоритет\" (Priority) і \"секція\" (Section) можуть бути змінені з\n"
-"допомогою файлу override.\n"
-"\n"
-"Крім того, apt-ftparchive може генерувати файли Sources з дерева\n"
-"тек, що містять файли .dsc. Для вказівки файлу override у цьому \n"
-"режимі можна використати параметр --source-override.\n"
-"\n"
-"Команди 'packages' і 'sources' треба виконувати, перебуваючи в кореневій "
-"теці\n"
-"дерева, що ви хочете обробити. BinaryPath повинен вказувати на місце,\n"
-"з якого починається рекурсивний обхід, а файл перепризначень (override)\n"
-"повинен містити запис про перепризначення керуючих полів. Якщо був "
-"зазначений\n"
-"Pathprefix, то його значення додається до керуючих полів, що містять\n"
-"імена файлів. Приклад використання для архіву Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Параметри:\n"
-"  -h    Цей текст\n"
-"  --md5 Керування генерацією MD5-хешів\n"
-"  -s=?  Вказати файл перепризначень (override) для пакунків з вихідними "
-"текстами\n"
-"  -q    Не виводити повідомлення в процесі роботи\n"
-"  -d=?  Вказати кешуючу базу даних (не обов'язково)\n"
-"  --no-delink Включити режим налагодження процесу видалення файлів\n"
-"  --contents  Керування генерацією повного переліку вмісту пакунків\n"
-"              (файлу Contents)\n"
-"  -c=?  Використати зазначений конфігураційний файл\n"
-"  -o=?  Вказати довільний параметр конфігурації"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Збігів не виявлено"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "У групі пакунків '%s' відсутні деякі файли"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "БД була пошкоджена, файл перейменований на %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "БД застаріла, намагаюсь оновити %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Невірний формат БД. Якщо ви оновилися зі старої версії apt, будь-ласка "
-"видаліть і наново створіть базу-даних."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Не вдалося відкрити файл БД %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Не вдалося одержати атрибути %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "В архіві немає запису 'control'"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Неможливо одержати курсор"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "У: Не вдалося прочитати директорію %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "У: Неможливо прочитати атрибути %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "П: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "У: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "П: Помилки відносяться до файлу "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Не вдалося визначити %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Не вдалося зробити обхід дерева"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Не вдалося відкрити %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Не вдалося прочитати посилання (readlink) %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Не вдалося видалити посилання (unlink) %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Не вдалося створити посилання %s на %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Перевищено ліміт в %sB в DeLink.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Архів не мав поля 'package'"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, fuzzy, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Відсутній запис про перепризначення (override) для %s\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  пакунок %s супроводжується %s, а не %s\n"
-
-#: ftparchive/writer.cc:712
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  Відсутній запис про перепризначення вихідних текстів для %s\n"
-
-#: ftparchive/writer.cc:716
-#, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  Крім того, відсутній запис про бінарне перепризначення для %s\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Не вдалося виділити пам'ять"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Не вдалося відкрити %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Не вдалося прочитати файл перепризначень (override) %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Невідомий алгоритм стиснення '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути стиснення"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Не вдалося створити FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Не вдалося породити процес (fork)"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Процес-нащадок, що виконує пакування"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Внутрішня помилка, не вдалося створити %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Помилка уведення/виводу в підпроцес/файл"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Помилка зчитування під час обчислення MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Не вдалося видалити %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Не вдалося перейменувати %s на %s"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Використання: apt-internal-solver\n"
-"\n"
-"apt-internal-solver це інтерфейс для використання поточного\n"
-"внутрішнього розв'язувача (як зовнішнього) для АРТ програм\n"
-"для дебагу чи інших цілей\n"
-"\n"
-"Опції:\n"
-"  -h     Цей текст допомоги.\n"
-"  -q     Виводити повідомлення, придатні для запису у файл журналу.\n"
-"          Не виводити індикатор прогресу\n"
-"  -c=? Читати зазначений конфігураційний файл\n"
-"  -o=? Вказати умовну опцію, наприклад, -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Невідомий запис про пакунок!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Використання: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs - простий інструмент для сортування переліків пакунків. Опція -"
-"s\n"
-"використається, щоб вказати тип списку.\n"
-"\n"
-"Опції:\n"
-"  -h   цей текст\n"
-"  -s   сортувати список файлів з вихідними текстами\n"
-"  -c=? читати зазначений файл конфігурації\n"
-"  -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Не вдалося створити канали (pipes)"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Не вдалося виконати gzip "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Пошкоджений архів"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Контрольна сума tar архіва невірна, архів пошкоджений"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Невідомий тип заголовку TAR - %u, член %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Невірний підпис архіву"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Неможливо прочитати заголовок 'member' в архіві"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Невірний заголовок 'member' %s в архіві"
-
-#: apt-inst/contrib/arfile.cc:106
-#, fuzzy
-msgid "Invalid archive member header"
-msgstr "Невірний заголовок 'member' в архіві"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Архів занадто малий"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Не вдалося прочитати заголовки в архіві"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode було викликано для вузла, що ще використовувався"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "Не вдалося знайти елемент хеша!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 #, fuzzy
 msgid "Failed to allocate diversion"
 msgstr "Не вдалося створити diversion"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Внутрішня помилка в AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, fuzzy, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Спроба перезапису diversion, %s -> %s і %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, fuzzy, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Подвійне додавання diversion %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Копія конфігураційного файлу %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Не вдалося записати файл %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Не вдалося закрити файл %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Шлях %s занадто довгий"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Розпакування %s більш ніж один раз"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, fuzzy, c-format
 msgid "The directory %s is diverted"
 msgstr "Директорія %s є відхиленою (diverted)"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Пакунок пробує записати у ціль з diversion %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 #, fuzzy
 msgid "The diversion path is too long"
 msgstr "Шлях 'diversion' є занадто довгим"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Не вдалося одержати атрибути %s"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Не вдалося перейменувати %s на %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Директорія %s замінюється не директорією"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 #, fuzzy
 msgid "Failed to locate node in its hash bucket"
 msgstr "Не вдалося знайти вузол у його наборі хешів"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Шлях занадто довгий"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Перезаписати відповідність пакунка без версії для %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Файл %s/%s перезаписує інший файл в пакунку %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Неможливо прочитати атрибути %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Не вдалося записати файл %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Не вдалося закрити файл %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Невірний DEB архів, відсутній член '%s'"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Внутрішня помилка, не можу знайти складову частину %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Контрольний файл не можливо обробити"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Неможливо відобразити в пам'яті (mmap) пустий файл"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Неможливо створити копію файлового дескриптора %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Неможливо зробити mmap для %llu байт"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Не вдалося закрити mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Не вдалося синхронізувати mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Неможливо відобразити в пам'яті %lu байт"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Не вдалося обрізати файл"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, fuzzy, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Динамічний MMap використав усе місце. Будь-ласка, збільшіть розмір APT::"
-"Cache-Start. Поточне значення: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Неможливо збільшити розмір MMap, так як обмеження в %lu байт вже досягнуто."
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Неможливо збільшити розмір MMap, так як автоматичне збільшення вимкнено "
-"користувачем."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liг %liхв %liс"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%liхв %liс"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%liс"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Вибір %s не знайдено"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Нерозпізнаваний тип абревіатури: '%c'"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Відкривається конфігураційний файл %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Синтаксична помилка %s:%u: Блок починається без назви."
-
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Синтаксична помилка %s:%u: спотворений тег"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Синтаксична помилка %s:%u: зайві символи після величини"
-
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-"Синтаксична помилка %s:%u: Директиви можуть бути виконані тільки на "
-"найвищому рівні"
-
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Синтаксична помилка %s:%u: Забагато вмонтованих (nested) включень"
-
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Синтаксична помилка %s:%u: Включено звідси"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Невірний підпис архіву"
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Синтаксична помилка %s:%u: Директива '%s' не підтримується"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Неможливо прочитати заголовок 'member' в архіві"
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Синтаксична помилка %s:%u: 'clear directive' потребує дерево налаштувань як "
-"аргумент"
+msgid "Invalid archive member header %s"
+msgstr "Невірний заголовок 'member' %s в архіві"
 
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Синтаксична помилка %s:%u: Зайве сміття в кінці файла"
+#: apt-inst/contrib/arfile.cc:108
+#, fuzzy
+msgid "Invalid archive member header"
+msgstr "Невірний заголовок 'member' в архіві"
 
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Помилка!"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Архів занадто малий"
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Виконано"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Не вдалося прочитати заголовки в архіві"
 
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Не вдалося створити канали (pipes)"
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Виконано"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Не вдалося виконати gzip "
 
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Невідомий параметр командного рядка '%c' [з %s]."
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Пошкоджений архів"
 
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Незрозумілий параметр %s командного рядка"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Контрольна сума tar архіва невірна, архів пошкоджений"
 
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Параметр %s командного рядка не є логічного типу 'boolean'"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Невідомий тип заголовку TAR - %u, член %s"
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Option %s requires an argument."
-msgstr "Параметр %s потребує аргумента."
+msgid "Unable to stat %s."
+msgstr "Неможливо прочитати атрибути %s."
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "Progress: [%3i%%]"
 msgstr ""
-"Опція %s: Специфікація вимагає, щоб рядки у конфігурації мали вираз =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Параметр %s потребує цілочислений аргумент, але не '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Параметр '%s' є занадто довгим"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Виконується dpkg"
 
-#: apt-pkg/contrib/cmndline.cc:336
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Незрозумілий вираз %s, спробуйте true чи false."
+msgid "Packaging system '%s' is not supported"
+msgstr "Система пакування '%s' не підтримується"
 
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Невірна дія %s"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Неможливо визначити тип необхідної системи пакування"
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Неможливо прочитати атрибути точки монтування %s"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "Не вдалося прочитати атрибути cdrom"
+msgid "Wrote %i records.\n"
+msgstr "Записано %i записів.\n"
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Проблема з закриттям gzip файла %s"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Записано %i записів з %i відсутніми файлами.\n"
 
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-"Блокування не використовується, так як файл блокування %s доступний тільки "
-"для зчитування"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Записано %i записів з %i невідповідними файлам\n"
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Could not open lock file %s"
-msgstr "Неможливо відкрити 'lock' файл %s"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Блокування не використовується, так як файл блокування %s знаходиться на "
-"файловій системі nfs"
+msgid "Can't find authentication record for: %s"
+msgstr "Неможливо знайти аутентифікаційний запис для: %s"
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not get lock %s"
-msgstr "Неможливо отримати замок %s"
+msgid "Hash mismatch for: %s"
+msgstr "Невідповідність хешу для: %s"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Неможливо створити перелік файлів, так як '%s' не є директорією"
+msgid "The method driver %s could not be found."
+msgstr "Драйвер для метода %s не знайдено."
 
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Ігнорується '%s' у директорії '%s', так як не є звичайним файлом"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "Ігнорується файл '%s' у директорії '%s', так як він не має розширення"
+msgid "Method %s did not start correctly"
+msgstr "Метод %s стартував некоректно"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Ігнорується файл '%s' у директорії '%s', так як він має невірне розширення"
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Підпроцес %s отримав 'segmentation fault' (фатальна помилка)."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Підпроцес %s отримав сигнал %u."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Підпроцес %s повернув код помилки (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Підпроцес %s раптово завершився"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Неможливо відкрити файл %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Неможливо відкрити файловий дескриптор %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Не вдалося створити IPC з породженим процесом"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Не вдалося виконати компресор "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "зчитування, повинен зчитати ще %llu байт, але нічого більше нема"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "записування, повинен був записати ще %llu байт, але не вдалося"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "Проблема з закриттям файла %s"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Проблема з перейменуванням файла %s на %s"
+"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter."
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Проблема з роз'єднанням файла %s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Не можу обробити чи відкрити перелік пакунків чи статусний файл."
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Проблема з синхронізацією файла"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Для виправлення цих помилок Ви можете виконати apt-get update"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Не встановлено 'keyring' у %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Неможливо прочитати перелік вихідних кодів."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Кеш пакунків пустий"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Файл кешу пакунків пошкоджений"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Файл кешу пакунків має несумісну версію"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Файл кешу пакунків пошкоджений, занадто малий"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Цей APT не підтримує систему призначення версій '%s'"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Кеш пакунків був побудований для іншої архітектури"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Залежності (Depends)"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Пре-Залежності (PreDepends)"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Пропонує (Suggests)"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Рекомендує (Recommends)"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Конфлікти (Conflicts)"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Заміняє (Replaces)"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Застарілі (Obsoletes)"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Ламає (Breaks)"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Покращує (Enhances)"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "важливі (important)"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "необхідні (required)"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "стандартні (standard)"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "необов'язкові (optional)"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "додаткові (extra)"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Побудова дерева залежностей"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Версії кандидатів"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Ґенерація залежностей"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Зчитування інформації про стан"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не вдалося відкрити StateFile %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не вдалося записати до тимчасового StateFile файла %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Неможливо проаналізувати файл пакунку %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Неможливо проаналізувати файл пакунку %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (dist)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Відкриття %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Рядок %u є занадто довгим у переліку джерел %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Неможливо прямо налаштувати конфігурацію на '%s'. Будь-ласка, дивіться man 5 "
-"apt.conf, нижче APT::Immediate-Configure для деталей. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Неможливо налаштувати '%s'."
-
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"Для виконання даного встановлення потрібне тимчасове видалення важливого "
-"пакунку %s через петлеві конфлікти/пре-залежності (Pre-Depends loop). Це "
-"погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-"
-"LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Тип '%s' індексного файлу не підтримується"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути "
-"пов'язано з зафіксованими пакунками."
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Відсутня директорія зі списками: %spartial"
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Відсутня директорія для архівів: %spartial"
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Неможливо заблокувати директорію %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Завантажується файл %li з %li (залишилось %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Завантажується файл %li з %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер для метода %s не знайдено."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s стартував некоректно"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter."
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Система пакування '%s' не підтримується"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Неможливо визначити тип необхідної системи пакування"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Неможливо прочитати атрибути %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Не можу обробити чи відкрити перелік пакунків чи статусний файл."
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Для виправлення цих помилок Ви можете виконати apt-get update"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Неможливо прочитати перелік вихідних кодів."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"Невірне значення '%s' для APT::Default-Release, так як такий випуск не є "
-"доступним у вихідних кодах"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Невірний запис у файлі налаштувань %s, відсутній заголовок Package"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Не зрозумів тип %s для фіксатора пакунків (pin)"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Не встановлено пріоритету (або стоїть 0) для фіксатора пакунків (pin)"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Кеш має несумісну систему призначення версій"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Виникла помилка під час обробки %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Ого! Ви перевищили кількість імен пакунків, які APT може обробити."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Ого! Ви перевищили кількість версій, які APT може обробити."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Ого! Ви перевищили кількість описів, які APT може обробити."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Пакунок %s %s не був знайдений під час обробки залежностей"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Зчитування переліків пакунків"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 #, fuzzy
 msgid "Collecting File Provides"
 msgstr "Збирання інформації про 'File Provides'"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Неможливо записати в %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Помилка IO під час збереження кешу вихідних текстів"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+#, fuzzy
+msgid "Send scenario to solver"
+msgstr "Відправити сценарій розв'язувачу"
+
+#: apt-pkg/edsp.cc:216
+#, fuzzy
+msgid "Send request to solver"
+msgstr "Відправити запит розв'язувачу"
+
+#: apt-pkg/edsp.cc:286
+#, fuzzy
+msgid "Prepare for receiving solution"
+msgstr "Пригодуватися до отримання розв'язку"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
+"помилку"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+#, fuzzy
+msgid "Execute external solver"
+msgstr "Виконати зовнішній розв'язувач"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "не вдалося перейменувати, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Невідповідність хешу MD5Sum"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Невідповідність розміру"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Невірна дія %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3112,16 +2254,16 @@ msgstr ""
 "Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у "
 "sources.list, або пошкоджений файл)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3130,12 +2272,12 @@ msgstr ""
 "Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього "
 "репозиторія не будуть застосовані."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3145,12 +2287,12 @@ msgstr ""
 "попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Помилка GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3159,83 +2301,147 @@ msgstr ""
 "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
 "власноруч виправити цей пакунок. (через відсутність 'arch')"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Неможливо проаналізувати 'Release' файл %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Блок постачальника %s не містить відбитку (fingerprint)"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Немає секцій у 'Release' файлі %s"
+msgid "List directory %spartial is missing."
+msgstr "Відсутня директорія зі списками: %spartial"
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Немає запису 'Hash' у 'Release' файлі %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Відсутня директорія для архівів: %spartial"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
+msgid "Unable to lock directory %s"
+msgstr "Неможливо заблокувати директорію %s"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Невірний запис 'Date' у 'Release' файлі %s"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Завантажується файл %li з %li (залишилось %s)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Блок постачальника %s не містить відбитку (fingerprint)"
+msgid "Retrieving file %li of %li"
+msgstr "Завантажується файл %li з %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Деякі індексні файли не вдалося завантажити. Вони були зігноровані, або "
+"замість них були використані старіші версії."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"Невірне значення '%s' для APT::Default-Release, так як такий випуск не є "
+"доступним у вихідних кодах"
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Невірний запис у файлі налаштувань %s, відсутній заголовок Package"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Не зрозумів тип %s для фіксатора пакунків (pin)"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Не встановлено пріоритету (або стоїть 0) для фіксатора пакунків (pin)"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Неможливо прямо налаштувати конфігурацію на '%s'. Будь-ласка, дивіться man 5 "
+"apt.conf, нижче APT::Immediate-Configure для деталей. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Неможливо налаштувати '%s'."
+
+#: apt-pkg/packagemanager.cc:577
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Для виконання даного встановлення потрібне тимчасове видалення важливого "
+"пакунку %s через петлеві конфлікти/пре-залежності (Pre-Depends loop). Це "
+"погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-"
+"LoopBreak."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Рядок %u є занадто довгим у переліку джерел %s."
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Демонтується CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Використовується точка монтування CD-ROM: %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "Демонтується CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Чекаю на диск...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Монтується CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "Ідентифікація.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "Ідентифікація... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Записано мітку: %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Демонтується CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "Сканується диск на вміст індексних файлів..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "Сканується диск на вміст індексних файлів...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3244,7 +2450,7 @@ msgstr ""
 "Знайдено %zu індексів пакунків, %zu індексів вихідних текстів, %zu індексів "
 "перекладів і %zu підписів\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3252,16 +2458,16 @@ msgstr ""
 "Неможливо знайти ніякі файли пакунків, можливо, що це не диск з Debian, або "
 "невірна архітектура?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Знайдено мітку: '%s'\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Не є вірною назвою, спробуйте ще.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3270,79 +2476,104 @@ msgstr ""
 "Цей диск зветься: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Копіюються переліки пакунків..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Записується новий перелік вихідних текстів\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Перелік вихідних текстів для цього диска:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Записано %i записів.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів."
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Записано %i записів з %i відсутніми файлами.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути "
+"пов'язано з зафіксованими пакунками."
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Побудова дерева залежностей"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версії кандидатів"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ґенерація залежностей"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Зчитування інформації про стан"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Записано %i записів з %i невідповідними файлам\n"
+msgid "Failed to open StateFile %s"
+msgstr "Не вдалося відкрити StateFile %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не вдалося записати до тимчасового StateFile файла %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Неможливо знайти аутентифікаційний запис для: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Неможливо проаналізувати файл пакунку %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Невідповідність хешу для: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Неможливо проаналізувати файл пакунку %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Випуск '%s' для '%s' не знайдено"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Версія '%s' для '%s' не знайдена"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Неможливо знайти завдання '%s'"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Неможливо вибирати версії пакунку '%s', так як він є чисто віртуальним"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3351,182 +2582,241 @@ msgstr ""
 "Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', "
 "так як вони відсутні"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Неможливо вибрати найновішу версію пакунку '%s', так як він є чисто "
 "віртуальним"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "Неможливо вибрати версію пакунку %s, так як він не має кандидатів"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Неможливо вибрати встановлену версію пакунку %s, так як такий пакунок не "
 "встановлено"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-#, fuzzy
-msgid "Send scenario to solver"
-msgstr "Відправити сценарій розв'язувачу"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Неможливо проаналізувати 'Release' файл %s"
 
-#: apt-pkg/edsp.cc:209
-#, fuzzy
-msgid "Send request to solver"
-msgstr "Відправити запит розв'язувачу"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Немає секцій у 'Release' файлі %s"
 
-#: apt-pkg/edsp.cc:279
-#, fuzzy
-msgid "Prepare for receiving solution"
-msgstr "Пригодуватися до отримання розв'язку"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Немає запису 'Hash' у 'Release' файлі %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
-"помилку"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-#, fuzzy
-msgid "Execute external solver"
-msgstr "Виконати зовнішній розв'язувач"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Невірний запис 'Date' у 'Release' файлі %s"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])"
+
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
+"Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Виконується dpkg"
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Деякі індексні файли не вдалося завантажити. Вони були зігноровані, або "
-"замість них були використані старіші версії."
+"Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Відкриття %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Встановлюється %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Налаштовується %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Видаляється %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Повністю видаляється %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Взято до відома зникнення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Виконується післяустановочний ініціатор %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Директорія '%s' відсутня"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Неможливо відкрити файл '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Підготовка %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Розпакування %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Підготовка до конфігурації %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Встановлено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Підготовка до видалення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Підготовка до повного видалення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Повністю видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Неможливо записати в %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "Операцію було перервано до того, як вона мала завершитися"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Звіт apport не був записаний, тому що параметр MaxReports вже досягнув "
 "максимальної величини"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "проблеми з залежностями - залишено неналаштованим"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3534,7 +2824,7 @@ msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, "
 "що ця помилка є наслідком попередньої невдачі."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3542,7 +2832,7 @@ msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
 "відсутність вільного місця на диску"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3550,7 +2840,7 @@ msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
 "відсутність вільного місця у пам'яті"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3559,14 +2849,14 @@ msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
 "відсутність вільного місця на диску"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
 "помилку В/В (I/O) у dpkg"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3575,14 +2865,14 @@ msgstr ""
 "Неможливо заблокувати адміністративну директорію (%s), може її використовує "
 "інший процес?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Неможливо заблокувати адміністративну директорію (%s), ви root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3590,10 +2880,756 @@ msgstr ""
 "dpkg було перервано, ви повинні вручну запустити '%s' аби виправити "
 "проблему. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Не заблоковано"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liг %liхв %liс"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%liхв %liс"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%liс"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Вибір %s не знайдено"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+"Блокування не використовується, так як файл блокування %s доступний тільки "
+"для зчитування"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Неможливо відкрити 'lock' файл %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"Блокування не використовується, так як файл блокування %s знаходиться на "
+"файловій системі nfs"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Неможливо отримати замок %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "Неможливо створити перелік файлів, так як '%s' не є директорією"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "Ігнорується '%s' у директорії '%s', так як не є звичайним файлом"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr "Ігнорується файл '%s' у директорії '%s', так як він не має розширення"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"Ігнорується файл '%s' у директорії '%s', так як він має невірне розширення"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Підпроцес %s отримав 'segmentation fault' (фатальна помилка)."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Підпроцес %s отримав сигнал %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Підпроцес %s повернув код помилки (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Підпроцес %s раптово завершився"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Проблема з закриттям gzip файла %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Неможливо відкрити файл %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Неможливо відкрити файловий дескриптор %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Не вдалося створити IPC з породженим процесом"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Не вдалося виконати компресор "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "зчитування, повинен зчитати ще %llu байт, але нічого більше нема"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "записування, повинен був записати ще %llu байт, але не вдалося"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Проблема з закриттям файла %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Проблема з перейменуванням файла %s на %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Проблема з роз'єднанням файла %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Проблема з синхронізацією файла"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Помилка!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Виконано"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Виконано"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Неможливо відобразити в пам'яті (mmap) пустий файл"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Неможливо створити копію файлового дескриптора %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Неможливо зробити mmap для %llu байт"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Не вдалося закрити mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Не вдалося синхронізувати mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Неможливо відобразити в пам'яті %lu байт"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "Не вдалося обрізати файл"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, fuzzy, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Динамічний MMap використав усе місце. Будь-ласка, збільшіть розмір APT::"
+"Cache-Start. Поточне значення: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Неможливо збільшити розмір MMap, так як обмеження в %lu байт вже досягнуто."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Неможливо збільшити розмір MMap, так як автоматичне збільшення вимкнено "
+"користувачем."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Неможливо прочитати атрибути точки монтування %s"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Не вдалося прочитати атрибути cdrom"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Нерозпізнаваний тип абревіатури: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Відкривається конфігураційний файл %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Синтаксична помилка %s:%u: Блок починається без назви."
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Синтаксична помилка %s:%u: спотворений тег"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Синтаксична помилка %s:%u: зайві символи після величини"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Синтаксична помилка %s:%u: Директиви можуть бути виконані тільки на "
+"найвищому рівні"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Синтаксична помилка %s:%u: Забагато вмонтованих (nested) включень"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Синтаксична помилка %s:%u: Включено звідси"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Синтаксична помилка %s:%u: Директива '%s' не підтримується"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Синтаксична помилка %s:%u: 'clear directive' потребує дерево налаштувань як "
+"аргумент"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Синтаксична помилка %s:%u: Зайве сміття в кінці файла"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Не встановлено 'keyring' у %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Невідомий параметр командного рядка '%c' [з %s]."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Незрозумілий параметр %s командного рядка"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Параметр %s командного рядка не є логічного типу 'boolean'"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Параметр %s потребує аргумента."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+"Опція %s: Специфікація вимагає, щоб рядки у конфігурації мали вираз =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Параметр %s потребує цілочислений аргумент, але не '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Параметр '%s' є занадто довгим"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Незрозумілий вираз %s, спробуйте true чи false."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Невірна дія %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Використання: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n"
+"і файли-шаблони\n"
+"\n"
+"Опції:\n"
+"  -h   Цей текст\n"
+"  -t   Встановити директорію для тимчасових файлів\n"
+"  -c=? Читати зазначений конфігураційний файл\n"
+"  -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Неможливо прочитати атрибути %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Неможливо визначити версію debconf. Він встановлений?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Список розширень, припустимих для пакунків, занадто довгий"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Помилка обробки директорії %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr ""
+"Список розширень, припустимих для пакунків з вихідними текстами, занадто "
+"довгий"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Помилка обробки повного переліку вмісту пакунків (Contents) %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Використання: apt-ftparchive [параметри] команда\n"
+"Команди:  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 генерує індексні файли архівів Debian. Він підтримує\n"
+"безліч стилів генерації: від повністю автоматичного до функціональної "
+"заміни\n"
+"програм dpkg-scanpackages і dpkg-scansources\n"
+"\n"
+"apt-ftparchive генерує файли Package (переліки пакунків) для дерева\n"
+"тек, що містять файли .deb. Файл Package містить у собі керуючі\n"
+"поля кожного пакунка, а також хеш MD5 і розмір файлу. Значення керуючих\n"
+"полів \"пріоритет\" (Priority) і \"секція\" (Section) можуть бути змінені з\n"
+"допомогою файлу override.\n"
+"\n"
+"Крім того, apt-ftparchive може генерувати файли Sources з дерева\n"
+"тек, що містять файли .dsc. Для вказівки файлу override у цьому \n"
+"режимі можна використати параметр --source-override.\n"
+"\n"
+"Команди 'packages' і 'sources' треба виконувати, перебуваючи в кореневій "
+"теці\n"
+"дерева, що ви хочете обробити. BinaryPath повинен вказувати на місце,\n"
+"з якого починається рекурсивний обхід, а файл перепризначень (override)\n"
+"повинен містити запис про перепризначення керуючих полів. Якщо був "
+"зазначений\n"
+"Pathprefix, то його значення додається до керуючих полів, що містять\n"
+"імена файлів. Приклад використання для архіву Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Параметри:\n"
+"  -h    Цей текст\n"
+"  --md5 Керування генерацією MD5-хешів\n"
+"  -s=?  Вказати файл перепризначень (override) для пакунків з вихідними "
+"текстами\n"
+"  -q    Не виводити повідомлення в процесі роботи\n"
+"  -d=?  Вказати кешуючу базу даних (не обов'язково)\n"
+"  --no-delink Включити режим налагодження процесу видалення файлів\n"
+"  --contents  Керування генерацією повного переліку вмісту пакунків\n"
+"              (файлу Contents)\n"
+"  -c=?  Використати зазначений конфігураційний файл\n"
+"  -o=?  Вказати довільний параметр конфігурації"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Збігів не виявлено"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "У групі пакунків '%s' відсутні деякі файли"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "БД була пошкоджена, файл перейменований на %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "БД застаріла, намагаюсь оновити %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Невірний формат БД. Якщо ви оновилися зі старої версії apt, будь-ласка "
+"видаліть і наново створіть базу-даних."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Не вдалося відкрити файл БД %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "В архіві немає запису 'control'"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Неможливо одержати курсор"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "У: Не вдалося прочитати директорію %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "У: Неможливо прочитати атрибути %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "П: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "У: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "П: Помилки відносяться до файлу "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Не вдалося визначити %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Не вдалося зробити обхід дерева"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Не вдалося відкрити %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr "DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Не вдалося прочитати посилання (readlink) %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Не вдалося видалити посилання (unlink) %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Не вдалося створити посилання %s на %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Перевищено ліміт в %sB в DeLink.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Архів не мав поля 'package'"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, fuzzy, c-format
+msgid "  %s has no override entry\n"
+msgstr "  Відсутній запис про перепризначення (override) для %s\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  пакунок %s супроводжується %s, а не %s\n"
+
+#: ftparchive/writer.cc:721
+#, fuzzy, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  Відсутній запис про перепризначення вихідних текстів для %s\n"
+
+#: ftparchive/writer.cc:725
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  Крім того, відсутній запис про бінарне перепризначення для %s\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Не вдалося виділити пам'ять"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Не вдалося відкрити %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Не вдалося прочитати файл перепризначень (override) %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Невідомий алгоритм стиснення '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути стиснення"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Не вдалося створити FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Не вдалося породити процес (fork)"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Процес-нащадок, що виконує пакування"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Внутрішня помилка, не вдалося створити %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Помилка уведення/виводу в підпроцес/файл"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Помилка зчитування під час обчислення MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Не вдалося видалити %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Використання: apt-internal-solver\n"
+"\n"
+"apt-internal-solver це інтерфейс для використання поточного\n"
+"внутрішнього розв'язувача (як зовнішнього) для АРТ програм\n"
+"для дебагу чи інших цілей\n"
+"\n"
+"Опції:\n"
+"  -h     Цей текст допомоги.\n"
+"  -q     Виводити повідомлення, придатні для запису у файл журналу.\n"
+"          Не виводити індикатор прогресу\n"
+"  -c=? Читати зазначений конфігураційний файл\n"
+"  -o=? Вказати умовну опцію, наприклад, -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Невідомий запис про пакунок!"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Використання: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs - простий інструмент для сортування переліків пакунків. Опція -"
+"s\n"
+"використається, щоб вказати тип списку.\n"
+"\n"
+"Опції:\n"
+"  -h   цей текст\n"
+"  -s   сортувати список файлів з вихідними текстами\n"
+"  -c=? читати зазначений файл конфігурації\n"
+"  -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s не є правильним DEB пакунком."
 
diff --git a/po/vi.po b/po/vi.po
index f7477fd12..5596474a1 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.9.15.1\n"
+"Project-Id-Version: apt 1.0.2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
-"PO-Revision-Date: 2014-02-10 07:50+0700\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"PO-Revision-Date: 2014-04-28 09:24+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
@@ -22,154 +22,155 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-Basepath: ../\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Gói %s phiên bản %s chưa thỏa mãn quan hệ phụ thuộc:\n"
+msgstr "Gói %s phiên bản %s có phần phụ thuộc chưa thỏa mãn:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "Tổng các tên gói: "
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "Tổng các cấu trúc gói: "
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Gói thường: "
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Gói thuần ảo: "
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Gói ảo đơn: "
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Gói ảo hỗn hợp: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Thiếu: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Tổng phiên bản riêng: "
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "Tổng mô tả riêng: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Tổng gói phụ thuộc: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Tổng liên quan phiên bản và tập tin: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "Tổng quan hệ mô-tả/tập-tin: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "Tổng ánh xạ Cung cấp: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "Tổng chỗ phiên bản phụ thuộc: "
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Tổng chỗ trống: "
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "Tổng chỗ đã tính dành cho: "
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, 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:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Không tìm thấy gói"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "Bạn phải đưa ra ít nhất một mẫu tìm kiếm"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Lệnh này đã lỗi thời. Xin hãy dùng lệnh “apt-mark showauto” để thay thế."
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
-msgstr "Không thể xác định vị trí của gói %s"
+msgstr "Không thể định vị gói %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Tập tin gói:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "Các gói đã ghim:"
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(không tìm thấy)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Đã cài đặt: "
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  Ứng cử: "
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(không)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  Ghim gói: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  Bảng phiên bản:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s-%s được biên dịch cho %s vào lúc “%s %s”\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -209,16 +210,16 @@ msgstr ""
 "           apt-cache [tùy_chọn...] showpkg gói1 [gói2 ...]\n"
 "           apt-cache [tùy_chọn...] showsrc gói1 [gói2 ...]\n"
 "(cache: bộ nhớ tạm\n"
-"showpkg: hiển thị gói\n"
-"showsrc: hiển thị nguồn)\n"
+"showpkg: hiển thị gói nhị phân\n"
+"showsrc: hiển thị gói nguồn)\n"
 "\n"
 "apt-cache là một công cụ ở mức thấp dùng để truy vấn\n"
 "thông tin từ các tập tin bộ nhớ tạm nhị phân của APT.\n"
 "\n"
 "Lệnh:\n"
-"   gencaches - Xây dựng (tạo ra) bộ nhớ tạm cho cả gói lẫn nguồn\n"
+"   gencaches - Tạo bộ nhớ tạm cho cả gói lẫn nguồn\n"
 "   showpkg - Hiện thông tin chung về một gói riêng lẻ\n"
-"   showsrc - Hiện các bản ghi nguồn\n"
+"   showsrc - Hiện các bản ghi cho gói nguồn\n"
 "   stats - Hiện phần thống kê cơ bản\n"
 "   dump - Hiện toàn bộ tập tin dạng ngắn (đổ)\n"
 "   dumpavail - In ra một tập tin sẵn dùng ra thiết bị xuất chuẩn\n"
@@ -226,11 +227,11 @@ msgstr ""
 "   search - Tìm kiếm danh sách các gói dựa trên biểu thức chính quy\n"
 "   show - Hiển thị bản ghi có thể đọc cho những gói đó\n"
 "   depends - Hiện thông tin quan hệ phụ thuộc dạng thô cho gói\n"
-"   rdepends - Hiện thông tin quan hệ phụ thuộc ngược lại cho gói\n"
+"   rdepends - Hiện thông tin những gói phụ thuộc vào gói này\n"
 "   pkgnames - Liệt kê danh sách mọi gói trên hệ thống\n"
 "   dotty - Tạo ra đồ thị gói cho GraphViz (nhiều chấm)\n"
 "   xvcg - Tạo ra đồ thị gói cho xvcg\n"
-"   policy - Hiển thị các cài đặt chính sách\n"
+"   policy - Hiển thị các cài đặt về chính sách\n"
 "\n"
 "Tùy chọn:\n"
 "  -h   Hiển thị trợ giúp này.\n"
@@ -243,32 +244,33 @@ msgstr ""
 "Để tìm thông tin thêm, xem hai trang hướng dẫn\n"
 "                 apt-cache(8) và apt.conf(5).\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-"Không tìm thấy CD-ROM bằng cách dò tìm hay sử dụng điểm gắn mặc định.\n"
-"Bạn có lẽ nên dùng tùy chọn --cdrom để đặt điểm gắn CD-ROM.\n"
-"Xem “man apt-cdrom” để có thêm thông tin về tự động dò tìm và điểm gắn CD-"
-"ROM."
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Hãy cung cấp tên cho Đĩa này, kiểu như là: “Debian 5.0.3 Đĩa 1”"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Hãy đưa đĩa vào ổ rồi bấm nút Enter"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Gặp lỗi khi gắn “%s” vào “%s”"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+"Không tìm thấy CD-ROM bằng cách tự động dò tìm hay sử dụng điểm gắn mặc "
+"định.\n"
+"Bạn có lẽ nên dùng tùy chọn --cdrom để đặt điểm gắn CD-ROM.\n"
+"Xem “man apt-cdrom” để có thêm thông tin về tự động dò tìm CD-ROM và điểm "
+"gắn."
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Hãy lặp lại tiến trình này cho các Đĩa còn lại trong bộ đĩa của bạn."
 
@@ -306,47 +308,47 @@ msgstr ""
 "  -c=? Đọc tập tin cấu hình này\n"
 "  -o=? Đặt một tùy chọn cấu hình tùy ý, ví dụ -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Không tìm thấy gói cho kiến trúc “%s”"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Không tìm thấy gói “%s” với phiên bản “%s”"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Không tìm thấy gói “%s” với số phát hành “%s”"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Đang chọn “%s” làm gói nguồn, thay thế cho “%s”\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Không tìm thấy phiên bản “%s” của gói “%s”"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Không tìm thấy gói %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, 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:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s được đặt thành “được tự động cài đặt”.\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -354,19 +356,19 @@ msgstr ""
 "Lệnh này đã lỗi thời. Xin hãy dùng lệnh “apt-mark auto” và “apt-mark manual” "
 "để thay thế."
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 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:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "Không thể khoá thư mục tải về"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn về cho nó"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Không tìm thấy gói nguồn cho %s"
@@ -392,79 +394,79 @@ msgstr ""
 "bzr branch %s\n"
 "để lấy các gói mới nhất (có thể là chưa phát hành).\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, 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:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Không thể tìm được chỗ trống trong %s"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Không đủ chỗ trống trên %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, 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"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Cần phải lấy %sB từ kho nguồn.\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Lấy mã nguồn %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "Gặp lỗi khi lấy một số kho."
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "Hoàn tất việc tải về và trong chế độ chỉ tải về"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, 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:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Lệnh giải nén “%s” bị lỗi.\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, 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ài đặt chưa.\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Lệnh biên dịch “%s” bị lỗi.\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "Tiến trình con bị lỗi"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Phải chỉ ra ít nhất một gói cần kiểm tra các phần phụ thuộc cần khi biên dịch"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -473,17 +475,17 @@ msgstr ""
 "Không có thông tin kiến trúc sẵn sàng cho %s. Xem apt.conf(5) APT::"
 "Architectures để cài đặt"
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Không thể lấy thông tin về các phần phụ thuộc khi biên dịch cho %s"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s không phụ thuộc vào gì khi biên dịch.\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -492,7 +494,7 @@ msgstr ""
 "Phần phụ thuộc %s cho %s không ổn thỏa bởi vì %s không được cho phép trên "
 "gói “%s”"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -500,14 +502,14 @@ msgid ""
 msgstr ""
 "Phần phụ thuộc %s cho %s không thể được thỏa mãn vì không tìm thấy gói %s"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Việc cố thỏa mãn quan hệ phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s là "
 "quá mới"
 
-#: cmdline/apt-get.cc:1345
+#: cmdline/apt-get.cc:1343
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -516,7 +518,7 @@ msgstr ""
 "phần phụ thuộc %s cho %s không thể được thỏa mãn phiên bản ứng cử của gói %s "
 "có thể thỏa mãn điều kiện phiên bản"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -525,30 +527,30 @@ msgstr ""
 "phần phụ thuộc %s cho %s không thể được thỏa mãn bởi vì gói %s không có bản "
 "ứng cử"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, 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:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Không thể thỏa mãn quan hệ phụ thuộc khi biên dịch cho %s."
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog cho %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Hỗ trợ các mô-đun:"
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -614,7 +616,7 @@ msgstr ""
 "   autoremove - Tự động gỡ bỏ tất cả các gói không dùng\n"
 "   purge - Gỡ bỏ và tẩy xóa gói\n"
 "   source - Tải về kho nguồn\n"
-"   build-dep - Định cấu hình quan hệ phụ thuộc khi biên dịch, cho gói nguồn\n"
+"   build-dep - Cấu hình quan hệ phụ thuộc khi biên dịch, cho gói nguồn\n"
 "   dist-upgrade - Nâng cấp hệ điều hành lên phiên bản mới hơn, hãy xem apt-"
 "get(8)\n"
 "   dselect-upgrade - Cho phép chọn dselect\n"
@@ -642,55 +644,84 @@ msgstr ""
 "       apt-get(8), 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-mark.cc:57
+#: cmdline/apt-helper.cc:35
+msgid "Must specify at least one pair url/filename"
+msgstr "Phải chỉ định ít nhất một cặp url/tên-tập-tin"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr "Gặp lỗi khi tải về"
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+"Cách dùng: apt-helper [các-tùy-chọn] lệnh\n"
+"           apt-helper [các-tùy-chọn] download-file uri đường-dẫn-đích\n"
+"\n"
+"apt-helper là phần trợ giúp dành cho apt\n"
+"\n"
+"Các lệnh:\n"
+"   download-file - tải về uri đã cho về đường-dẫn-đích\n"
+"\n"
+"     Lệnh trợ giúp APT này có Sức Mạnh của Siêu “Meep”.\n"
+
+#: cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "không thể đánh dấu %s như là nó chưa được cài đặt.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s được đặt thành được cài đặt bằng tay.\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s đã sẵn được đặt thành cài đặt tự động rồi.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s đã sẵn được đặt là giữ lại.\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s đã sẵn được đặt là không giữ lại.\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Cần %s nhưng mà không thấy nó ở đây"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s được đặt là giữ lại.\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Hủy bỏ nắm giữ %s.\n"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 "Thực thi lệnh “dpkg” gặp lỗi. Bạn có cần quyền siêu người dùng để thực thi "
 "lệnh này"
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -742,8 +773,7 @@ msgstr ""
 "Để tìm thông tin thêm, xem hai trang man (hướng dẫn)\n"
 "                          apt-mark(8) và apt.conf(5)"
 
-#: cmdline/apt.cc:71
-#, fuzzy
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -767,7 +797,7 @@ msgstr ""
 "Cách dùng: apt [các tùy chọn] lệnh\n"
 "\n"
 "CLI (giao diện dòng lệnh) dành cho apt.\n"
-"Lệnh: \n"
+"Các lệnh cơ bản:\n"
 " list - liệt kê các gói dựa trên cơ sở là tên gói\n"
 " search - tìm trong phần mô tả của gói\n"
 " show - hiển thị thông tin chi tiết về gói\n"
@@ -809,52 +839,52 @@ msgstr "Không thể bỏ gắn đĩa CD-ROM trong %s. Có lẽ nó vẫn đang
 msgid "Disk not found."
 msgstr "Không tìm thấy đĩa."
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "Không tìm thấy tập tin"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Gặp lỗi khi lấy thống kê"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Gặp lỗi khi đặt giờ sửa đổi"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Địa chỉ URI không hợp lệ, URI nội bộ không thể bắt đầu bằng “//”"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Đang đăng nhập vào"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "Không thể quyết định tên ngang hàng"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "Không thể phân giải tên cục bộ"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Máy phục vụ đã từ chối kết nối, và đã nói: %s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Lệnh USER (người dùng) đã thất bại: máy chủ nói: %s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy chủ nói: %s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -862,121 +892,123 @@ msgstr ""
 "Đã ghi rõ máy phục vụ ủy nhiệm, nhưng mà chưa ghi rõ tập lệnh đăng nhập. "
 "“Acquire::ftp::ProxyLogin” là rỗng."
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Văn lệnh đăng nhập “%s” đã thất bại: máy chủ nói: %s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Lệnh TYPE (kiểu) đã thất bại: máy chủ nói: %s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "Thời hạn kết nối"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "Máy phục vụ đã đóng kết nối"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Lỗi đọc"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Một trả lời đã tràn bộ đệm."
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "Giao thức bị hỏng"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Lỗi ghi"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "Không thể tạo ổ cắm"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "Gặp lỗi"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "Không thể kết nối ổ cắm bị động."
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
-msgstr "Không thể đóng kết ổ cắm"
+msgstr "Không thể ràng buộc ổ cắm"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "Không thể lắng nghe trên ổ cắm đó"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "Không thể quyết định tên ổ cắm đó"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "Không thể gửi lệnh PORT (cổng)"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Không biết họ địa chỉ %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy chủ nói: %s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Quá giờ kết nối ổ cắm dữ liệu"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "Không thể chấp nhận kết nối"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "Gặp vấn đề băm tập tin"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Không thể lấy tập tin: máy phục vụ nói “%s”"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Ổ cắm dữ liệu đã quá giờ"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Việc truyền dữ liệu bị lỗi: máy phục vụ nói “%s”"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "Truy vấn"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "Không thể gọi "
 
@@ -1012,7 +1044,7 @@ msgstr "Không thể kết nối đến %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Đang kết nối đến %s"
@@ -1042,22 +1074,22 @@ msgstr "Một số hư hỏng đã xảy ra khi phân giải “%s:%s” (%i - %
 msgid "Unable to connect to %s:%s:"
 msgstr "Không thể kết nối đến %s: %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 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ể xác định vân tay của khóa?!"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 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:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Không thể thực hiện “gpgv” để thẩm tra chữ ký (gpgv đã được cài đặt chưa?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1066,156 +1098,385 @@ msgstr ""
 "Tập tin Clearsigned không hợp lệ, nhận được “%s” (mạng yêu cầu xác nhận phải "
 "không?)"
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "Gặp lỗi không rõ khi thực hiện gpgv"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "Những chữ ký theo đây không hợp lệ:\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 "Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn có:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr "Các tập tin trống rỗng không phải là kho lưu hợp lệ"
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "Gặp lỗi khi ghi vào tập tin"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Gặp lỗi khi đọc từ máy phục vụ: Máy chủ đã đóng kết nối"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "Gặp lỗi khi đọc từ máy phục vụ"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "Gặp lỗi khi ghi vào tập tin"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "Việc chọn bị lỗi"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "Kết nối đã quá giờ"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "Gặp lỗi khi ghi vào tập tin đầu ra"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Đang đợi phần đầu dữ liệu..."
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "Dòng đầu sai"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 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/server.cc:176
+#: methods/server.cc:171
 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 dung) không "
 "hợp lệ"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 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 vi nội dung) không "
 "hợp lệ"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "Máy phục vụ HTTP không hỗ trợ tải một phần tập tin"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Không rõ định dạng ngày"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "Dữ liệu phần đầu sai"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Kết nối bị lỗi"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Gặp lỗi nội bộ"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Đang tính toán nâng cấp... "
+
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Lỗi nội bộ: Lệnh nâng cấp đã làm hỏng thứ gì đó"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Xong"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr "Đang sắp xếp"
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr "Đang liệt kê"
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Ở đây có %i phiên bản phụ thêm. Hãy dùng tùy chọn “-a” để xem."
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Đang sửa chữa quan hệ phụ thuộc..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " gặp lỗi."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Không thể sửa phần phụ thuộc"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Không thể tối thiểu hóa tập hợp nâng cấp"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Xong"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa những lỗi trên."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn “-f”."
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "không hiểu"
+
+#: apt-private/private-output.cc:232
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[đã cài, có thể nâng cấp thành: %s]"
+
+#: apt-private/private-output.cc:236
+msgid "[installed,local]"
+msgstr "[đã cài đặt,nội bộ]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr "[đã cài,có thể tự động gỡ bỏ]"
+
+#: apt-private/private-output.cc:241
+msgid "[installed,automatic]"
+msgstr "[đã cài đặt,tự động]"
+
+#: apt-private/private-output.cc:243
+msgid "[installed]"
+msgstr "[đã cài đặt]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[có thể nâng cấp từ: %s]"
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr "[residual-config]"
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:"
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "nhưng mà %s đã được cài đặt"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "nhưng mà %s sẽ được cài đặt"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "nhưng mà nó không có khả năng cài đặt"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "nhưng mà nó là gói ảo"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "nhưng mà nó không được cài đặt"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "nhưng mà nó sẽ không được cài đặt"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " hay"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Những gói sau sẽ bị GỠ BỎ:"
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "Những gói sau đây được giữ lại:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "Những gói sau đây sẽ được NÂNG CẤP:"
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:"
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (bởi vì %s) "
+
+#: apt-private/private-output.cc:662
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n"
+"ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu nâng cấp, %lu được cài đặt mới, "
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu được cài đặt lại, "
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu bị hạ cấp, "
+
+#: apt-private/private-output.cc:701
+#, 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"
+
+#: apt-private/private-output.cc:705
+#, 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"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr "[C/k]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr "[c/K]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr "C"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr "K"
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Lỗi biên dịch biểu thức chính quy - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Lệnh cập nhật không chấp nhận đối số"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "Ở đây có %i bản ghi phụ thêm. Hãy dùng tùy chọn “-a” để xem"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "không là gói thật (ảo)"
+
+#: apt-private/private-install.cc:81
 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!"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 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."
+msgstr ""
+"Cần phải gỡ bỏ một số gói, nhưng mà tính năng Gỡ bỏ (Remove) đã bị tắt."
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 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"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Lạ nhỉ... Kích cỡ không khớp nhau. Hãy gửi thư cho <apt@packages.debian.org>"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Cần phải lấy %sB/%sB từ kho chứa.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Cần phải lấy %sB từ kho chứa.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ bị chiếm dụng.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng.\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s."
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Có lỗi và đã dùng tùy chọn “-y” mà không có  “--force-yes”"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Đã đưa ra “Chỉ không đáng kể” (Trivial Only) nhưng mà thao tác này là đáng "
@@ -1223,11 +1484,11 @@ msgstr ""
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Có, làm đi!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1238,19 +1499,19 @@ msgstr ""
 "Nếu vẫn muốn tiếp tục thì hãy gõ cụm từ “%s”\n"
 "?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "Hủy bỏ."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "Bạn có muốn tiếp tục không?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "Một số tập tin không tải về được"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1259,20 +1520,20 @@ msgstr ""
 "nhật)\n"
 "hay dùng tùy chọn “--fix-missing” (sửa thiếu sót) không?"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 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) và trao đổi phương tiện."
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "Không thể sửa những gói còn thiếu."
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "Đang hủy bỏ tiến trình cài đặt."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1283,15 +1544,15 @@ msgstr[0] ""
 "Những gói theo đây không còn nằm trên hệ thống này vì mọi tập tin đều bị gói "
 "khác ghi đè:"
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Ghi chú: Thay đổi này được tự động thực hiện bởi dpkg."
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 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"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1309,15 +1570,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ bạn giải quyết tình trạng này:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Lỗi nội bộ: Bộ Gỡ bỏ Tự động đã làm hỏng một thứ gì đó"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1326,23 +1587,23 @@ msgid_plural ""
 msgstr[0] ""
 "(Các) gói sau đây đã được tự động cài đặt nên không còn cần yêu cầu lại:"
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
 msgstr[0] "%lu gói đã được tự động cài đặt nên không còn cần yêu cầu lại.\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Hãy dùng lệnh “apt-get autoremove” để gỡ bỏ chúng."
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Có lẽ bạn cần chạy lệnh “apt-get -f install” để sửa những cái đó:"
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1350,7 +1611,7 @@ msgstr ""
 "Thưa thỏa mãn quan hệ phụ thuộc. Hãy thử chạy lệnh “apt-get -f install” mà "
 "không có gói nào (hoặc chỉ định cách thức giải quyết)."
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1362,317 +1623,96 @@ msgstr ""
 "chưa ổn định cái mà yêu cầu các gói mà nó còn chưa được tạo ra\n"
 "hay chưa được chuyển ra khỏi phần Incoming (Đến)."
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "Gói bị hỏng"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "Những gói thêm theo đây sẽ được cài đặt:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "Các gói đề nghị:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "Gói khuyến khích:"
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"CHÚ Ý: đây chỉ là mô phỏng!\n"
+"       apt-get yêu cầu quyền root để thực hiện thật.\n"
+"       Cần nhớ rằng chức năng khóa đã bị tắt,\n"
+"       nên có thể nó không chính xác như khi làm thật!"
+
+#: apt-private/private-download.cc:31
 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!"
+msgstr "CẢNH BÁO: Không thể xác thực những gói sau đây!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "Cảnh báo xác thực bị đè.\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "Một số gói không thể được xác thực"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "Cài đặt những gói này mà không cần thẩm tra?"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Gặp lỗi khi lấy về %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr "không hiểu"
-
-#: apt-private/private-output.cc:201
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[đã cài, có thể nâng cấp thành: %s]"
-
-#: apt-private/private-output.cc:205
-msgid "[installed,local]"
-msgstr "[đã cài đặt,nội bộ]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr "[đã cài,có thể tự động gỡ bỏ]"
-
-#: apt-private/private-output.cc:210
-msgid "[installed,automatic]"
-msgstr "[đã cài đặt,tự động]"
-
-#: apt-private/private-output.cc:212
-msgid "[installed]"
-msgstr "[đã cài đặt]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[có thể nâng cấp từ: %s]"
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr "[residual-config]"
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:"
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "nhưng mà %s đã được cài đặt"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "nhưng mà %s sẽ được cài đặt"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "nhưng mà nó không có khả năng cài đặt"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "nhưng mà nó là gói ảo"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "nhưng mà nó không được cài đặt"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "nhưng mà nó sẽ không được cài đặt"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " hay"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:"
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "Những gói sau sẽ bị GỠ BỎ:"
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "Những gói sau đây được giữ lại:"
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "Những gói sau đây sẽ được NÂNG CẤP:"
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:"
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (bởi vì %s) "
-
-#: apt-private/private-output.cc:631
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n"
-"ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu nâng cấp, %lu được cài đặt mới, "
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu được cài đặt lại, "
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu bị hạ cấp, "
-
-#: apt-private/private-output.cc:670
-#, 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"
-
-#: apt-private/private-output.cc:674
-#, 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"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr "[C/k]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr "[c/K]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr "C"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr "K"
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Lỗi biên dịch biểu thức chính quy - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Đang sửa chữa quan hệ phụ thuộc..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " gặp lỗi."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Không thể sửa phần phụ thuộc"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "Không thể tối thiểu hóa tập hợp nâng cấp"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Xong"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa những lỗi trên."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn “-f”."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr "Đang sắp xếp"
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "Lệnh cập nhật không chấp nhận đối số"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "Đang tính toán nâng cấp... "
-
-#: apt-private/private-upgrade.cc:24
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Lỗi nội bộ: Upgrade (Nâng cấp) đã làm hỏng thứ gì đó"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "Xong"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr "Tìm kiếm toàn văn"
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] "Ở đây có %lu bản ghi phụ thêm. Hãy dùng tùy chọn “-a” để xem"
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr "không là gói thật (ảo)"
-
-#: apt-private/private-main.cc:19
-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 ""
-"CHÚ Ý: đây chỉ là mô phỏng!\n"
-"       apt-get yêu cầu quyền root để thực hiện thật.\n"
-"       Cần nhớ rằng chức năng khóa đã bị tắt,\n"
-"       nên có thể nó không chính xác như những gì làm thật!"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Gặp lỗi khi phân tích %s. Sửa lại chứ? "
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr "Tập tin “%s” của bạn đã thay đổi, hãy chạy lệnh “apt-get update”."
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr "Tìm kiếm toàn văn"
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Tìm thấy "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "Lấy:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "Bỏq "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "Lỗi "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Đã lấy về %sB mất %s (%sB/g).\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Đang hoạt động]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1685,19 +1725,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "Không thể đọc %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Không thể chuyển đổi sang %s"
@@ -1726,11 +1766,11 @@ msgstr "Không tìm thấy điểm vào trong tập tin bản sao “%s”"
 msgid "[Mirror: %s]"
 msgstr "[Bản sao: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
-msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi"
+msgstr "Gặp lỗi khi tạo ống IPC đến tiến trình con"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "Kết nối bị đóng bất ngờ"
 
@@ -1770,1358 +1810,447 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Đang hòa trộn các thông tin sẵn có..."
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n"
-"\n"
-"[extract:  rút trích;\n"
-"templates: mẫu]\n"
-"\n"
-"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n"
-"\tvà biểu mẫu đều từ gói Debian\n"
-"\n"
-"Tùy chọn:\n"
-"  -h   Trợ giúp này\n"
-"  -t   Đặt thư mục tạm thời\n"
-"       [t: viết tắt cho từ “temporary”: tạm thời]\n"
-"  -c=? Đọc tập tin cấu hình này\n"
-"  -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Không thể ghi vào %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "Danh sách mở rộng gói quá dài"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Gặp lỗi khi xử lý thư mục %s"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "Danh sách mở rộng nguồn quá dài"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Gặp lỗi khi xử lý nội dung %s"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n"
-"\n"
-"[ftparchive: FTP archive: kho FTP]\n"
-"\n"
-"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n"
-"      sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n"
-"      contents path\n"
-"      release path\n"
-"      generate config [các_nhóm]\n"
-"      clean config\n"
-"\n"
-"(packages:    những gói;\n"
-"binarypath:   đường dẫn nhị phân;\n"
-"sources:      những nguồn;\n"
-"srcpath:      đường dẫn nguồn;\n"
-"contents path: đường dẫn nội dung;\n"
-"release path: đường dẫn bản đã phát hành;\n"
-"generate config [groups]: tạo ra cấu hình [các nhóm];\n"
-"clean config: cấu hình toàn mới)\n"
-"\n"
-"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n"
-"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n"
-"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n"
-"và dpkg-scansources (dpkg-quét_nguồn).\n"
-"\n"
-"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n"
-"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n"
-"cùng với băm MD5 và kích cỡ tập tin.\n"
-"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n"
-"\n"
-"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n"
-"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n"
-"để ghi rõ tập tin đè nguồn\n"
-"\n"
-"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n"
-"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ "
-"quy,\n"
-"và tập tin đè nên chứa những cờ đè.\n"
-"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n"
-"những trường tên tập tin nếu có.\n"
-"Cách sử dụng thí dụ từ kho Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Tùy chọn:\n"
-"  -h    _Trợ giúp_ này\n"
-"  --md5 Điều khiển cách tạo ra MD5\n"
-"  -s=?  Tập tin đè nguồn\n"
-"  -q    _Im lặng_ (không xuất chi tiết)\n"
-"  -d=?  Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n"
-"  --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n"
-"  --contents  Điều khiển cách tạo ra tập tin _nội dung_\n"
-"  -c=?  Đọc tập tin cấu hình này\n"
-"  -o=?  Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "Không có cái được chọn khớp được"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”."
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)."
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản "
-"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s."
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Việc lấy thông tin thống kê cho %s bị lỗi"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Kho không có mục ghi điều khiển"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Không thể lấy con trỏ"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "CB: Không thể đọc thư mục %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "CB: Không thể lấy thông tin thống kê %s\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "L: "
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "CB: "
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "LỖI: có lỗi áp dụng vào tập tin "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Gặp lỗi khi phân giải %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "Việc di chuyển qua cây bị lỗi"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "Gặp lỗi khi mở %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Bỏ liên kết %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Gặp lỗi khi đọc liên kết %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Việc bỏ liên kết %s bị lỗi"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Gặp lỗi khi liên kết %s đến %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Hết hạn bỏ liên kết của %sB.\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "Kho không có trường gói"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s không có mục ghi đè (override)\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  người bảo trì %s là %s không phải %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s không có mục ghi đè (override) nguồn\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s cũng không có mục ghi đè (override) nhị phân\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "Không thể mở %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Sai “override” %s dòng %llu (%s)"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Việc đọc tập tin đè %s bị lỗi"
-
-#: ftparchive/override.cc:163
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Sai override %s dòng %llu #1"
-
-#: ftparchive/override.cc:175
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Sai override %s dòng %llu #2"
-
-#: ftparchive/override.cc:188
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Sai override %s dòng %llu #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Không biết thuật toán nén “%s”"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Dữ liệu xuất đã nén %s cần một bộ nén"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "Việc tạo TẬP_TIN* bị lỗi"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Gặp lỗi khi rẽ nhánh tiến trình"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "Nén con"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "Gặp lỗi khi đọc trong khi tính MD5"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Gặp lỗi khi bỏ liên kết %s"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Việc đổi tên %s thành %s bị lỗi"
-
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Cách dùng: apt-internal-solver\n"
-"\n"
-"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n"
-"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n"
-"để phục vụ cho việc gỡ lỗi hay tương tự thế\n"
-"\n"
-"Tùy chọn:\n"
-"  -h  Trợ giúp này.\n"
-"  -q  Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n"
-"  -c=? Đọc tập tin cấu hình này\n"
-"  -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Không hiểu bản ghi gói!"
-
-#: cmdline/apt-sortpkgs.cc:153
-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 ""
-"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n"
-"\n"
-"[sortpkgs: sort packages: sắp xếp các gói]\n"
-"\n"
-"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n"
-"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n"
-"\n"
-"Tùy chọn:\n"
-"  -h   Trợ giúp_ này\n"
-"  -s   Sắp xếp những tập tin _nguồn_\n"
-"  -c=? Đọc tập tin cấu hình này\n"
-"  -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "Việc thực hiện gzip bị lỗi "
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "Kho bị hỏng."
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Chữ ký kho không hợp lệ"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Gặp lỗi khi đọc phần đầu thành viên kho"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Phần đầu thành viên kho lưu không hợp lệ %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Phần đầu thành viên kho không hợp lê"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Kho quá ngắn"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "Việc đọc phần đầu kho bị lỗi"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
-msgstr "Gặp lỗi xác định vị trí phần tử băm!"
+msgstr "Gặp lỗi khi định vị phần tử băm!"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
-msgstr "Gặp lỗi khi xác định vị trí trệch đi"
+msgstr "Gặp lỗi khi định vị trệch đi"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Sự trệch đi được thêm hai lần %s → %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Việc ghi tập tin %s gặp lỗi"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Việc đóng tập tin %s gặp lỗi"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "Đường dẫn %s quá dài"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Đang giải nén %s nhiều lần"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Thư mục %s bị trệch hướng"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "Đường dẫn trệch đi quá dài"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Việc lấy thông tin thống kê cho %s bị lỗi"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Việc đổi tên %s thành %s bị lỗi"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
-msgstr "Gặp lỗi khi xác định vị trí điểm nút trong hộp băm nó bị lỗi"
+msgstr "Gặp lỗi định vị điểm nút trong hộp băm nó bị lỗi"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "Đường dẫn quá dài"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Không thể lấy thông tin thống kê %s"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Việc ghi tập tin %s gặp lỗi"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Việc đóng tập tin %s gặp lỗi"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
-msgstr "Gặp lỗi nội bộ, không thể xác định vị trí thành viên %s"
+msgstr "Gặp lỗi nội bộ, không thể định vị thành viên %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "Tập tin điều khiển không có khả năng phân tách"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Không thể nhân đôi bộ mô tả tập tin %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %llu byte"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Không thể đóng mmap (ánh xạ bộ nhớ)"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Không thể động bộ hoá mmap (ánh xạ bộ nhớ)"
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-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-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Chữ ký kho không hợp lệ"
 
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "Gặp lỗi khi cắt ngắn tập tin"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Gặp lỗi khi đọc phần đầu thành viên kho"
 
-#: apt-pkg/contrib/mmap.cc:341
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Dynamic MMap (ánh xạ bộ nhớ động) đã vượt quá kích thước tối đa cho phép.\n"
-"Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n"
-"Giá trị hiện thời là: %lu. (man 5 apt.conf)"
+msgid "Invalid archive member header %s"
+msgstr "Phần đầu thành viên kho lưu không hợp lệ %s"
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte."
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Phần đầu thành viên kho không hợp lê"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người "
-"dùng tắt đi."
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Kho quá ngắn"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li ngày %li giờ %li phút %li giây"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Việc đọc phần đầu kho bị lỗi"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li giờ %li phút %li giây"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh"
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%li phút %li giây"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Việc thực hiện gzip bị lỗi "
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%li giây"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Kho bị hỏng."
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "Không tìm thấy vùng chọn %s"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng"
 
-#: apt-pkg/contrib/configuration.cc:503
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Không chấp nhận kiểu viết tắt: “%c”"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s"
 
-#: apt-pkg/contrib/configuration.cc:617
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Đang mở tập tin cấu hình %s..."
+msgid "Unable to stat %s."
+msgstr "Không thể lấy trạng thái về %s."
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-pkg/install-progress.cc:57
 #, 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."
+msgid "Progress: [%3i%%]"
+msgstr "Diễn biến: [%3i%%]"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "Đang chạy dpkg"
 
-#: apt-pkg/contrib/configuration.cc:821
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị"
+msgid "Packaging system '%s' is not supported"
+msgstr "Không hỗ trợ hệ thống đóng gói “%s”"
 
-#: apt-pkg/contrib/configuration.cc:861
-#, 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: Chỉ có thể thực hiện chỉ thị mức đầu"
+#: apt-pkg/init.cc:162
+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"
 
-#: apt-pkg/contrib/configuration.cc:868
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau"
+msgid "Wrote %i records.\n"
+msgstr "Đã ghi %i bản ghi.\n"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, 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”"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n"
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối "
-"số"
-
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Lỗi!"
-
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Xong"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr "..."
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... %u%%"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Không rõ tùy chọn dòng lệnh “%c” [từ %s]."
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Không hiểu tùy chọn dòng lệnh %s"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Tùy chọn %s yêu cầu một đối số."
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=<giá_trị>”."
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải “%s”"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Tùy chọn “%s” quá dài"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)."
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Thao tác “%s” không hợp lệ"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-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:225
-msgid "Failed to stat the cdrom"
-msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Gặp vấn đề khi đóng tập tin gzip %s"
+"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với "
+"nhau\n"
 
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s"
+msgid "Can't find authentication record for: %s"
+msgstr "Không tìm thấy bản ghi xác thực cho: %s"
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open lock file %s"
-msgstr "Không thể mở tập tin khóa %s"
+msgid "Hash mismatch for: %s"
+msgstr "Sai khớp chuỗi duy nhất cho: %s"
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s"
+msgid "The method driver %s could not be found."
+msgstr "Không tìm thấy trình điều khiển phương thức %s."
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Could not get lock %s"
-msgstr "Không thể lấy khóa %s"
+msgid "Is the package %s installed?"
+msgstr "Gói “%s” đã được cài đặt chưa?"
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục"
+msgid "Method %s did not start correctly"
+msgstr "Phương thức %s đã không khởi chạy đúng đắn."
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter."
 
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Không thể phân tích hay mở danh sách gói hay tập tin trạng thái."
 
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
-"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp "
-"lệ"
-
-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn."
-
-#: apt-pkg/contrib/fileutl.cc:864
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Tiến trình con %s đã nhận tín hiệu %u."
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Tiến trình con %s đã thoát bất thường"
-
-#: apt-pkg/contrib/fileutl.cc:1016
-#, c-format
-msgid "Could not open file %s"
-msgstr "Không thể mở tập tin %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Không thể mở bộ mô tả tập tin %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "Việc tạo tiến trình con IPC bị lỗi"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "Gặp lỗi khi thực hiện nén "
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "ghi, còn cần ghi %llu nhưng mà không thể"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "Gặp vấn đề khi đóng tập tin %s"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s"
-
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s"
-
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "Gặp vấn đề khi đồng bộ hóa tập tin"
+"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề "
+"này"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Không có vòng khoá nào được cài đặt vào %s."
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Không thể đọc danh sách nguồn."
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "Bộ nhớ tạm gói trống"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "Tập tin nhớ tạm gói bị hỏng"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Tập tin nhớ tạm gói bị hỏng, nó quá nhỏ"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, 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:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "Phụ thuộc"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "Phụ thuộc sẵn"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "Đề nghị"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "Khuyến khích"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "Xung đột"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "Thay thế"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "Cũ"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "Làm hỏng"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "Tăng cường"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "quan trọng"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "yêu cầu"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "chuẩn"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "tùy chọn"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "bổ sung"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Đang xây dựng cây quan hệ phụ thuộc"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Phiên bản ứng cử"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Tạo ra quan hệ phụ thuộc"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "Đang đọc thông tin về tình trạng"
-
-#: apt-pkg/depcache.cc:244
-#, 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:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Không thể phân tích tập tin gói %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Không thể phân tích tập tin gói %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Gặp đoạn sai dạng %u trong danh sách nguồn %s (ngữ pháp URI)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân "
-"tích được)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép "
-"gán)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá "
-"trị)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "Đang mở %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Dòng %u quá dài trong danh sách nguồn %s."
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)."
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s."
-
-#: apt-pkg/sourcelist.cc:407
-#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt."
-"conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, c-format
-msgid "Could not configure '%s'. "
-msgstr "Không thể cấu hình “%s”. "
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do "
-"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu "
-"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-"
-"LoopBreak” (buộc ngắt vòng lặp)."
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó."
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-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:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng."
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Thiếu thư mục danh sách %spartial."
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Thiếu thư mục kho lưu %spartial."
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Không thể khoá thư mục %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Đang tải tập tin %li trong tổng số %li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Không tìm thấy trình điều khiển phương thức %s."
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Hãy kiểm tra xem gói “dpkg-dev” đã được cài đặt chưa.\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Phương thức %s đã không khởi chạy đúng đắn."
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter."
-
-#: apt-pkg/init.cc:143
-#, 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:159
-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"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Không thể lấy trạng thái về %s."
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Không thể phân tích hay mở danh sách gói hay tập tin trạng thái."
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề "
-"này"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "Không thể đọc danh sách nguồn."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành "
-"không sẵn có trong mã nguồn"
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)."
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Không hiểu kiểu ghim %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý."
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý."
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý."
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "Đang đọc các danh sách gói"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "Đang tập hợp các Nhà cung cấp Tập tin"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Không thể ghi vào %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr "Gửi kịch bản đến bộ phân giải"
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr "Gửi yêu cầu đến bộ phân giải"
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr "Chuẩn bị để lấy cách giải quyết"
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp"
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr "Thi hành bộ phân giải từ bên ngoài"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "gặp lỗi khi đổi tên, %s (%s → %s)."
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
-msgstr "Mã băm tổng kiểm tra (hash sum) không khớp"
+msgstr "Mã băm tổng kiểm tra không khớp"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "Kích cỡ không khớp nhau"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 msgid "Invalid file format"
 msgstr "Định dạng tập tập tin không hợp lệ"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3130,16 +2259,16 @@ msgstr ""
 "Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong "
 "sources.list hoặc tập tin bị hỏng)"
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3148,12 +2277,12 @@ msgstr ""
 "Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho "
 "này sẽ không được áp dụng."
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3164,12 +2293,12 @@ msgstr ""
 "Lỗi GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Lỗi GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3178,12 +2307,12 @@ msgstr ""
 "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
 "này, do thiếu kiến trúc."
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”"
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3191,74 +2320,137 @@ msgstr ""
 "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
 "tin:) cho gói %s."
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Khối nhà bán %s không chứa vân tay"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "Không có phần nào trong tập tin Phát hành %s"
+msgid "List directory %spartial is missing."
+msgstr "Thiếu thư mục danh sách %spartial."
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s"
+msgid "Archives directory %spartial is missing."
+msgstr "Thiếu thư mục kho lưu %spartial."
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgid "Unable to lock directory %s"
+msgstr "Không thể khoá thư mục %s"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)"
+
+#: apt-pkg/acquire.cc:901
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Đang tải tập tin %li trong tổng số %li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
-"Gặp mục tin “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát "
-"hành %s"
+"Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã "
+"được dùng thay thế."
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
-"Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s"
+"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành "
+"không sẵn có trong mã nguồn"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/policy.cc:422
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Khối nhà bán %s không chứa vân tay"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
+"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)."
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n"
+msgid "Did not understand pin type %s"
+msgstr "Không hiểu kiểu ghim %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt."
+"conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr "Không thể cấu hình “%s”. "
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do "
+"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu "
+"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-"
+"LoopBreak” (buộc ngắt vòng lặp)."
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Dòng %u quá dài trong danh sách nguồn %s."
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
 msgstr "Đang bỏ gắn CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:586
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n"
+
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Đang đợi đĩa...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Đang gắn đĩa CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr "Đang nhận diện... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Nhãn đã lưu: %s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "Đang bỏ gắn CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3266,7 +2458,7 @@ 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:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3274,16 +2466,16 @@ msgstr ""
 "Không tìm thấy tập tin gói nào, có thể vì đây không phải là một Đĩa Debian, "
 "hoặc có kiến trúc không đúng?"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Tìm thấy nhãn “%s”\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3292,81 +2484,103 @@ msgstr ""
 "Tên đĩa này:\n"
 "“%s”\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Đang sao chép các danh sách gói..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "Đang ghi danh sách nguồn mới\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "Các mục tin danh sách nguồn cho đĩa này:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "Đã ghi %i bản ghi.\n"
+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/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+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/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng."
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Đang xây dựng cây quan hệ phụ thuộc"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Phiên bản ứng cử"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Tạo ra quan hệ phụ thuộc"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Đang đọc thông tin về tình trạng"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n"
+msgid "Failed to open StateFile %s"
+msgstr "Lỗi mở tập tin tình trạng StateFile %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với "
-"nhau\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Không tìm thấy bản ghi xác thực cho: %s"
+msgid "Unable to parse package file %s (1)"
+msgstr "Không thể phân tích tập tin gói %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Sai khớp chuỗi duy nhất cho: %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Không thể phân tích tập tin gói %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, 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”"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Không tìm thấy phiên bản “%s” cho “%s”"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Không tìm thấy tác vụ “%s”"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”"
 
-#: apt-pkg/cacheset.cc:605
-#, fuzzy, c-format
+#: apt-pkg/cacheset.cc:615
+#, c-format
 msgid "Couldn't find any package by glob '%s'"
-msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”"
+msgstr "Không tìm thấy gói nào theo đường dẫn “%s”"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Không thể chọn phiên bản trong gói “%s” vì nó chỉ là ảo"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3375,173 +2589,248 @@ msgstr ""
 "Không thể chọn phiên bản được cài đặt hoặc phiên bản ứng cử trong gói “%s” "
 "mà không có trong nó"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "Không thể chọn phiên bản mới nhất trong gói “%s” vì nó chỉ là ảo"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "Không thể chọn phiên bản ứng cử trong gói %s vì nó không có ứng cử"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài "
 "đặt"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr "Gửi kịch bản đến bộ phân giải"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr "Gửi yêu cầu đến bộ phân giải"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Không có phần nào trong tập tin Phát hành %s"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr "Chuẩn bị để lấy cách giải quyết"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+"Gặp mục tin “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát "
+"hành %s"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr "Thi hành bộ phân giải từ bên ngoài"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr ""
+"Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr "Diễn biến: [%3i%%]"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Gặp đoạn sai dạng %u trong danh sách nguồn %s (ngữ pháp URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "Đang chạy dpkg"
+#: apt-pkg/sourcelist.cc:170
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân "
+"tích được)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)"
+
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
-"Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã "
-"được dùng thay thế."
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép "
+"gán)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá "
+"trị)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Đang mở %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)."
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s."
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "Đang cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "Đang cấu hình %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "Đang gỡ bỏ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "Đang gỡ bỏ hoàn toàn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Đang ghi chép sự biến mất của %s"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Đang chạy bẫy sau-cài-đặt %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Thiếu thư mục “%s”"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Không thể mở tập tin “%s”"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "Đang chuẩn bị %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "Đang mở gói %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Đang chuẩn bị cấu hình %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "Đã cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Đang chuẩn bị gỡ bỏ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "Đã gỡ bỏ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, 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:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "Gỡ bỏ hoàn toàn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) gặp lỗi"
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "Không thể ghi nhật ký (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr "/dev/pts đã gắn chưa?"
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr "Đầu ra là thiết bị cuối?"
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành"
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3549,14 +2838,14 @@ msgstr ""
 "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp "
 "do một sự thất bại trước đó."
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3564,7 +2853,7 @@ msgstr ""
 "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ "
 "bộ nhớ”"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3572,13 +2861,13 @@ msgstr ""
 "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ "
 "thống nội bộ"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3587,14 +2876,14 @@ msgstr ""
 "Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó "
 "phải không?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3602,10 +2891,762 @@ msgstr ""
 "dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải "
 "vấn đề này. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "Chưa được khoá"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li ngày %li giờ %li phút %li giây"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li giờ %li phút %li giây"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li phút %li giây"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li giây"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Không tìm thấy vùng chọn %s"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Không thể mở tập tin khóa %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Không thể lấy khóa %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục"
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường"
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng"
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp "
+"lệ"
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn."
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Tiến trình con %s đã nhận tín hiệu %u."
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Tiến trình con %s đã thoát bất thường"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Gặp vấn đề khi đóng tập tin gzip %s"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "Không thể mở tập tin %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Không thể mở bộ mô tả tập tin %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "Việc tạo tiến trình con IPC bị lỗi"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "Gặp lỗi khi thực hiện nén "
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "ghi, còn cần ghi %llu nhưng mà không thể"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Gặp vấn đề khi đóng tập tin %s"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "Gặp vấn đề khi đồng bộ hóa tập tin"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Lỗi!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Xong"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr "..."
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Không thể nhân đôi bộ mô tả tập tin %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %llu byte"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Không thể đóng mmap (ánh xạ bộ nhớ)"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Không thể động bộ hoá mmap (ánh xạ bộ nhớ)"
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+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:322
+msgid "Failed to truncate file"
+msgstr "Gặp lỗi khi cắt ngắn tập tin"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamic MMap (ánh xạ bộ nhớ động) đã vượt quá kích thước tối đa cho phép.\n"
+"Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n"
+"Giá trị hiện thời là: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte."
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người "
+"dùng tắt đi."
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+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:246
+msgid "Failed to stat the cdrom"
+msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Không chấp nhận kiểu viết tắt: “%c”"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Đang mở tập tin cấu hình %s..."
+
+#: apt-pkg/contrib/configuration.cc:801
+#, 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:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, 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: Chỉ có thể thực hiện chỉ thị mức đầu"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, 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:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối "
+"số"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Không có vòng khoá nào được cài đặt vào %s."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Không hiểu tùy chọn dòng lệnh “%c” [từ %s]."
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Không hiểu tùy chọn dòng lệnh %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Tùy chọn %s yêu cầu một đối số."
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=<giá_trị>”."
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải “%s”"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Tùy chọn “%s” quá dài"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)."
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Thao tác “%s” không hợp lệ"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n"
+"\n"
+"[extract:  rút trích;\n"
+"templates: mẫu]\n"
+"\n"
+"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n"
+"\tvà biểu mẫu đều từ gói Debian\n"
+"\n"
+"Tùy chọn:\n"
+"  -h   Trợ giúp này\n"
+"  -t   Đặt thư mục tạm thời\n"
+"       [t: viết tắt cho từ “temporary”: tạm thời]\n"
+"  -c=? Đọc tập tin cấu hình này\n"
+"  -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Không thể tạo tập tin tạm (hàm mkstemp) %s"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "Danh sách mở rộng gói quá dài"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Gặp lỗi khi xử lý thư mục %s"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "Danh sách mở rộng nguồn quá dài"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Gặp lỗi khi xử lý nội dung %s"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n"
+"\n"
+"[ftparchive: FTP archive: kho FTP]\n"
+"\n"
+"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n"
+"      sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n"
+"      contents path\n"
+"      release path\n"
+"      generate config [các_nhóm]\n"
+"      clean config\n"
+"\n"
+"(packages:    những gói;\n"
+"binarypath:   đường dẫn nhị phân;\n"
+"sources:      những nguồn;\n"
+"srcpath:      đường dẫn nguồn;\n"
+"contents path: đường dẫn nội dung;\n"
+"release path: đường dẫn bản đã phát hành;\n"
+"generate config [groups]: tạo ra cấu hình [các nhóm];\n"
+"clean config: cấu hình toàn mới)\n"
+"\n"
+"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n"
+"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n"
+"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n"
+"và dpkg-scansources (dpkg-quét_nguồn).\n"
+"\n"
+"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n"
+"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n"
+"cùng với băm MD5 và kích cỡ tập tin.\n"
+"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n"
+"\n"
+"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n"
+"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n"
+"để ghi rõ tập tin đè nguồn\n"
+"\n"
+"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n"
+"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ "
+"quy,\n"
+"và tập tin đè nên chứa những cờ đè.\n"
+"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n"
+"những trường tên tập tin nếu có.\n"
+"Cách sử dụng thí dụ từ kho Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Tùy chọn:\n"
+"  -h    _Trợ giúp_ này\n"
+"  --md5 Điều khiển cách tạo ra MD5\n"
+"  -s=?  Tập tin đè nguồn\n"
+"  -q    _Im lặng_ (không xuất chi tiết)\n"
+"  -d=?  Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n"
+"  --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n"
+"  --contents  Điều khiển cách tạo ra tập tin _nội dung_\n"
+"  -c=?  Đọc tập tin cấu hình này\n"
+"  -o=?  Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Không có cái được chọn khớp được"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”."
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)."
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản "
+"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s."
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Kho không có mục ghi điều khiển"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "Không thể lấy con trỏ"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "CB: Không thể đọc thư mục %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "CB: Không thể lấy thông tin thống kê %s\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "L: "
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "CB: "
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "LỖI: có lỗi áp dụng vào tập tin "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Gặp lỗi khi phân giải %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "Việc di chuyển qua cây bị lỗi"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "Gặp lỗi khi mở %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " Bỏ liên kết %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Gặp lỗi khi đọc liên kết %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Việc bỏ liên kết %s bị lỗi"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Gặp lỗi khi liên kết %s đến %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Hết hạn bỏ liên kết của %sB.\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "Kho không có trường gói"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s không có mục ghi đè (override)\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  người bảo trì %s là %s không phải %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s không có mục ghi đè (override) nguồn\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s cũng không có mục ghi đè (override) nhị phân\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Không thể mở %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Sai “override” %s dòng %llu (%s)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Việc đọc tập tin đè %s bị lỗi"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Sai override %s dòng %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Sai override %s dòng %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Sai override %s dòng %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Không biết thuật toán nén “%s”"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Dữ liệu xuất đã nén %s cần một bộ nén"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Việc tạo TẬP_TIN* bị lỗi"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Gặp lỗi khi rẽ nhánh tiến trình"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Nén con"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Gặp lỗi khi đọc trong khi tính MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Gặp lỗi khi bỏ liên kết %s"
+
+#: cmdline/apt-internal-solver.cc:46
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Cách dùng: apt-internal-solver\n"
+"\n"
+"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n"
+"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n"
+"để phục vụ cho việc gỡ lỗi hay tương tự thế\n"
+"\n"
+"Tùy chọn:\n"
+"  -h  Trợ giúp này.\n"
+"  -q  Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n"
+"  -c=? Đọc tập tin cấu hình này\n"
+"  -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Không hiểu bản ghi gói!"
+
+#: cmdline/apt-sortpkgs.cc:153
+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 ""
+"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n"
+"\n"
+"[sortpkgs: sort packages: sắp xếp các gói]\n"
+"\n"
+"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n"
+"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n"
+"\n"
+"Tùy chọn:\n"
+"  -h   Trợ giúp_ này\n"
+"  -s   Sắp xếp những tập tin _nguồn_\n"
+"  -c=? Đọc tập tin cấu hình này\n"
+"  -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s không phải là một gói DEB hợp lệ."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5df69c4ee..99926a97c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+0200\n"
 "PO-Revision-Date: 2010-08-26 14:42+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -19,152 +19,153 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "软件包名称总数："
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 msgid "Total package structures: "
 msgstr "全部软件包结构："
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  普通软件包："
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  完全虚拟软件包："
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  单虚拟软件包："
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  混合虚拟软件包："
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  缺失："
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "按版本共计："
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "按不同的说明共计："
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "按依赖关系共计："
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "按版本/文件关系共计："
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "按说明/文件关系共计："
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "提供映射共计："
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "Glob 字串共计："
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "依赖关系版本名所占空间共计："
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "Slack 空间共计："
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "总占用空间："
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未同步。"
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "没有发现匹配的软件包"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 msgid "You must give at least one search pattern"
 msgstr "您必须明确地给出至少一个表达式"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "未发现软件包 %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "软件包文件："
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "被锁定的软件包："
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(没有找到)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  已安装："
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  候选软件包："
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(无)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  软件包锁："
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -238,28 +239,28 @@ msgstr ""
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 "若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "请把盘片插入驱动器再按回车键"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "无法将 %s 挂载到 %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
 
@@ -295,65 +296,65 @@ msgstr ""
 "  -c=? 读取指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "无法按照正则表达式 %s 找到任何软件包"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "无法按照正则表达式 %s 找到任何软件包"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "无法按照正则表达式 %s 找到任何软件包"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "选择 %s 作为源代码包而非 %s\n"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，问题解决工具坏事了"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "无法锁定下载目录"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
@@ -378,114 +379,114 @@ msgstr ""
 "bzr get %s\n"
 "获得该软件包的最近更新(可能尚未正式发布)。\n"
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载过的文件“%s”\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "无法获知您在 %s 上的可用空间"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "您在 %s 上没有足够的可用空间"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "忽略已经被解包到 %s 目录的源代码包\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "子进程出错"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系信息"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, 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:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -494,37 +495,37 @@ msgstr ""
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 "
 "%1$s 依赖关系"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "正在连接 %s (%s)"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "支持的模块："
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -612,53 +613,74 @@ msgstr ""
 "以获取更多信息和选项。\n"
 "                       本 APT 具有超级牛力。\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "要下载源代码，必须指定至少一个对应的软件包"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "但是它还没有被安装"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s 已经是最新的版本了。\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s 已经是最新的版本了。\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s 已设置为手动安装。\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "无法打开 %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -685,7 +707,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -733,173 +755,175 @@ msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"
 msgid "Disk not found."
 msgstr "找不到盘片。"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "无法找到该文件"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "无法读取状态"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "无法设置文件的修改日期"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "无效的 URI，本地的 URI 不能以 // 开头"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "正在登录"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "无法获知对方主机名"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "无法获知本地主机名"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "服务器拒绝了我们的连接，响应信息为：%s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "连接超时"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "服务器关闭了连接"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "读错误"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "回应超出了缓存区大小。"
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "协议有误"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "写出错"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "无法创建套接字"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "无法连接上数据套接字，连接超时"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "失败"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "无法连接被动模式的套接字。"
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo 无法得到监听套接字"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "无法绑定套接字"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "无法在套接字上监听"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "无法确定套接字的名字"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "无法发出 PORT 指令"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "无法识别的地址族 %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "数据套接字连接超时"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "把文件加入哈希表时出错"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "无法获取文件，服务器响应信息为“%s”"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "数据套接字超时"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "数据传送出错，服务器响应信息为“%s”"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "查询"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "无法调用 "
 
@@ -935,7 +959,7 @@ msgstr "无法连接上 %s:%s (%s)。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "正在连接 %s"
@@ -965,181 +989,413 @@ msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "不能连接到 %s：%s："
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "运行 gpgv 时发生未知错误"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "下列签名无效：\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "由于没有公钥，无法验证下列签名：\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "写入文件出错"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "写入文件出错"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "select 调用出错"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "连接超时"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "正在等待报头"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "错误的报头行"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "该 HTTP 服务器发送了一个无效的应答报头"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "该 HTTP 服务器的 range 支持不正常"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "错误的报头数据"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "内部错误"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "正在对升级进行计算... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "内部错误，全部升级工具坏事了"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "完成"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "正在更正依赖关系..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失败。"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "无法更正依赖关系"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "无法最小化要升级的软件包集合"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [已安装]"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [已安装]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [已安装]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr " [已安装]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "下列软件包有未满足的依赖关系："
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "但是 %s 已经安装"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "但是 %s 正要被安装"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "但无法安装它"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "但是它是虚拟软件包"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "但是它还没有被安装"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "但是它将不会被安装"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " 或"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】软件包将被安装："
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "下列软件包将被【卸载】："
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "下列软件包的版本将保持不变："
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "下列软件包将被升级："
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列软件包将被【降级】："
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "下列被要求保持版本不变的软件包将被改变："
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (是由于 %s) "
+
+#: apt-private/private-output.cc:662
+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"
+"请勿尝试，除非您确实知道您在做什么！"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "重新安装了 %lu 个软件包，"
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "降级了 %lu 个软件包，"
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "编译正则表达式时出错 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr " update 命令不需要参数"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部错误，Ordering 未能完成"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "需要下载 %sB/%sB 的软件包。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "需要下载 %sB 的软件包。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "您在 %s 上没有足够的可用空间。"
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "是，按我说的做！"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1150,19 +1406,19 @@ msgstr ""
 "若还想继续的话，就输入下面的短句“%s”\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "中止执行。"
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 msgid "Do you want to continue?"
 msgstr "您希望继续执行吗？"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "有一些文件无法下载"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1170,19 +1426,19 @@ msgstr ""
 "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
 "再试试？"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目前还不支持 --fix-missing 和介质交换"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "无法更正缺少的软件包。"
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "中止安装。"
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1191,15 +1447,15 @@ msgid_plural ""
 "all files have been overwritten by other packages:"
 msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "注意：这是自动被 dpkg 有意完成的。"
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我们不应该进行删除，无法启动自动删除器"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1215,15 +1471,15 @@ msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "下列信息可能会对解决问题有所帮助："
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部错误，自动卸载工具坏事了"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1231,24 +1487,24 @@ msgid_plural ""
 "required:"
 msgstr[0] "下列软件包是自动安装的并且现在不需要了："
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
 msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "使用'apt-get autoremove'来卸载它们"
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1256,7 +1512,7 @@ msgstr ""
 "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
 "以指定一个解决办法)。"
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1267,320 +1523,95 @@ msgstr ""
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们已被从新到(Incoming)目录移出。"
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "破损的软件包"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "将会安装下列额外的软件包："
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+"注意：这只是模拟！\n"
+"　　　apt-get 需要 root 特权进行实际的执行。\n"
+"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "【警告】：下列软件包不能通过验证！"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "忽略了认证警告。\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "有些软件包不能通过验证"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "不经验证就安装这些软件包吗？"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [已安装]"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [已安装]"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [已安装]"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr " [已安装]"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "下列软件包有未满足的依赖关系："
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "但是 %s 已经安装"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "但是 %s 正要被安装"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "但无法安装它"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "但是它是虚拟软件包"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "但是它还没有被安装"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "但是它将不会被安装"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr " 或"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】软件包将被安装："
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "下列软件包将被【卸载】："
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "下列软件包的版本将保持不变："
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "下列软件包将被升级："
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列软件包将被【降级】："
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "下列被要求保持版本不变的软件包将被改变："
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (是由于 %s) "
-
-#: apt-private/private-output.cc:631
-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"
-"请勿尝试，除非您确实知道您在做什么！"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "重新安装了 %lu 个软件包，"
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "降级了 %lu 个软件包，"
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "编译正则表达式时出错 - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "正在更正依赖关系..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " 失败。"
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "无法更正依赖关系"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "无法最小化要升级的软件包集合"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " 完成"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr " update 命令不需要参数"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "正在对升级进行计算... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "内部错误，全部升级工具坏事了"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "完成"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-"注意：这只是模拟！\n"
-"　　　apt-get 需要 root 特权进行实际的执行。\n"
-"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "无法将 %s 重命名为 %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "命中 "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "获取："
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "忽略 "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "错误 "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "下载 %sB，耗时 %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [执行中]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1593,19 +1624,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "无法切换工作目录到 %s"
@@ -1634,11 +1665,11 @@ msgstr "没有找到镜像文件 %s"
 msgid "[Mirror: %s]"
 msgstr "[镜像：%s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "无法为子进程创建 IPC 管道"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"
 
@@ -1676,1342 +1707,473 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们，
 msgid "Merging available information"
 msgstr "正在合并可用信息"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
-"信息的工具\n"
-"\n"
-"选项：\n"
-"  -h   本帮助文本\n"
-"  -t   设置 temp 目录\n"
-"  -c=? 读指定的配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "无法写入 %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "软件包的扩展列表太长"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "处理目录 %s 时出错"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "源扩展列表太长"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "将头写入到目录文件时出错"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "处理目录 %s 时出错"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"用法： apt-ftparchive [选项] 命令\n"
-"命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
-"       sources 源代码包搜索路径 [overridefile [路径前缀]]\n"
-"       contents 搜索路径\n"
-"       release 搜索路径\n"
-"       generate 配置文件 [groups]\n"
-"       clean 配置文件\n"
-"\n"
-"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
-"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n"
-"和 dpkg-scansources，都能游刃有余\n"
-"\n"
-"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
-"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
-"还有软件包的所有控制字段的内容。该软件同时支持 override 文件，\n"
-"通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
-"\n"
-"与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"
-"可以通过使用 --source-override 选项来指定一个 override 文件\n"
-"\n"
-"使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"
-"二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n"
-"应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
-"下面有个来自 Debian 文档的例子：\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"选项:\n"
-"  -h    本帮助文档\n"
-"  --md5 使之生成 MD5 校验和\n"
-"  -s=?  源代码包 override 文件\n"
-"  -q    输出精简信息\n"
-"  -d=?  指定可选的缓存数据库\n"
-"  -d=?  使用另一个可选的缓存数据库\n"
-"  --no-delink 开启delink的调试模式\n"
-"  --contents  使之生成控制内容文件\n"
-"  -c=?  读取指定配置文件\n"
-"  -o=?  设置任意指定的配置选项"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "没有任何选定项是匹配的"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "软件包文件组“%s”中缺少一些文件"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "数据库已过期，现尝试进行升级 %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "无法打开数据库文件 %s：%s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "无法获得 %s 的状态"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "归档文件没有包含控制字段"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "无法获得游标"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "警告：无法读取目录 %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "警告：无法获得 %s 的状态\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "错误："
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "警告："
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "错误：处理文件时出错 "
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "无法解析 %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "无法遍历目录树"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "无法打开 %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "无法读取符号链接 %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "无法使用 unlink 删除 %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** 无法将 %s 链接到 %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " 达到了 DeLink 的上限 %sB。\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "归档文件没有包含 package 字段"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s 中没有 override 项\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 的维护者 %s 并非 %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s 没有源代码的 override 项\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s 中没有二进制文件的 override 项\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 分配内存失败"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "无法打开 %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "无法读取 override 文件 %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "未知的压缩算法“%s”"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "无法创建 FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "无法 fork"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "压缩子进程"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "内部错误，无法创建 %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "无法对子进程或文件进行读写"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "在计算 MD5 校验和时无法读取数据"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "在使用 unlink 删除 %s 时出错"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "无法将 %s 重命名为 %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
-"信息的工具\n"
-"\n"
-"选项：\n"
-"  -h   本帮助文本\n"
-"  -t   设置 temp 目录\n"
-"  -c=? 读指定的配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "未知的软件包记录！"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-sortpkgs 是对软件包索引文件内容进行排序的简单工具。-s 选项\n"
-"是用来指出后面参数所示文件是哪种文件。\n"
-"\n"
-"选项：\n"
-"  -h   本帮助文档\n"
-"  -s   根据源文件排序\n"
-"  -c=? 读取指定配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "无法创建管道"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "无法执行 gzip"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "包文件已被损坏"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar 的校验和不符，文件已损坏"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "未知的 TAR 数据头类型 %u，成员 %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "无效的归档签名"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "读取归档成员文件头出错"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "归档文件中成员文件头 %s 无效"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "归档文件中成员文件头无效"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "归档文件太短"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "无法读取归档文件的数据头"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "把 DropNode 用在了仍在链表中的节点上"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "无法定位哈希表元素！"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "无法分配转移项"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "内部错误，出现在 AddDiversion"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "添加了两个转移项 %s-> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "重复的配置文件 %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "无法写入文件 %s"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "无法关闭文件 %s"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "路径名 %s 太长"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s 被解包了不只一次"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "目录 %s 已被转移"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "该软件包正尝试写入转移对象 %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "该转移路径太长"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "无法获得 %s 的状态"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "无法将 %s 重命名为 %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "目录 %s 要被一个非目录的文件替换"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "无法在其散列桶中分配节点"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "路径名太长"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "无法读取 %s 的状态"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "无法写入文件 %s"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "无法关闭文件 %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "内部错误，无法定位包内文件 %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "不能解析的主控文件"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "无法 mmap 一个空文件"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "无法为复制文件描述符 %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "无法 mmap %lu 字节的数据"
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "无法关闭 mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "无法同步 mmap "
-
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "无法 mmap %lu 字节的数据"
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "无法截断文件"
-
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 "
-"apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"
-
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
-#, 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:408
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li小时 %li分 %li秒"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
-msgstr "%li分 %li秒"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
-msgstr "%li秒"
-
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "找不到您选则的 %s"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "无法识别的类型缩写：“%c”"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "无效的归档签名"
 
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "正在打开配置文件 %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "读取归档成员文件头出错"
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "语法错误 %s:%u：配置小节没有以名字开头"
+msgid "Invalid archive member header %s"
+msgstr "归档文件中成员文件头 %s 无效"
 
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "语法错误 %s:%u：标签格式有误"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "归档文件中成员文件头无效"
 
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "归档文件太短"
 
-#: apt-pkg/contrib/configuration.cc:861
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "无法读取归档文件的数据头"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "无法创建管道"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "语法错误 %s:%u：Included from here"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "无法执行 gzip"
 
-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "语法错误 %s:%u：不支持的指令“%s”"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "包文件已被损坏"
 
-#: apt-pkg/contrib/configuration.cc:884
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar 的校验和不符，文件已损坏"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "未知的 TAR 数据头类型 %u，成员 %s"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... 有错误！"
+msgid "Unable to stat %s."
+msgstr "无法读取 %s 的状态。"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... 完成"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... 完成"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "未知的命令行选项“%c” [来自 %s]"
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "无法识别命令行选项 %s"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "命令行选项 %s 不是布尔值"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "选项 %s 要求有一个参数"
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "选项“%s”太长"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "不能识别参数 %s，请用 true 或 false"
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "无效的操作 %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "无法读取文件系统挂载点 %s 的状态"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "无法读取盘片的状态"
-
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "关闭 gzip %s 文件出错"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "由于文件系统为只读，因而无法使用文件锁 %s"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "无法打开锁文件 %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "无法获得锁 %s"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "正在运行 dpkg"
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgid "Packaging system '%s' is not supported"
+msgstr "不支持“%s”打包系统"
 
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "无法确定适合的打包系统类型"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgid "Wrote %i records.\n"
+msgstr "已写入 %i 条记录。\n"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "子进程 %s 发生了段错误"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "子进程 %s 收到信号 %u。"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "子进程 %s 返回了一个错误号 (%u)"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "子进程 %s 异常退出"
+msgid "Can't find authentication record for: %s"
+msgstr "无法找到认证记录：%s"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Could not open file %s"
-msgstr "无法打开文件 %s"
+msgid "Hash mismatch for: %s"
+msgstr "Hash 校验和不符：%s"
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Could not open file descriptor %d"
-msgstr "无法打开文件描述符 %d"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "无法创建子进程的 IPC 管道"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "无法执行压缩程序"
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "读取文件出错，还剩 %lu 字节没有读出"
+msgid "The method driver %s could not be found."
+msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "写入文件出错，还剩 %lu 字节没有保存"
+msgid "Is the package %s installed?"
+msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
-#: apt-pkg/contrib/fileutl.cc:1723
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "关闭文件 %s 出错"
+msgid "Method %s did not start correctly"
+msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 
-#: apt-pkg/contrib/fileutl.cc:1735
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "重命名文件 %s 为 %s 出错"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "用 unlink 删除文件 %s 出错"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "无法解析或打开软件包的列表或是状态文件。"
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "同步文件出错"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "您可能需要运行 apt-get update 来解决这些问题"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s 中没有安装密钥环。"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "无法读取源列表。"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "软件包缓存区是空的"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "软件包缓存文件损坏了"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "软件包缓存区文件的版本不兼容"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "软件包缓存文件损坏了"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本程序目前不支持“%s”版本系统"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "软件包缓存区是为其它架构的硬件构建的"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "依赖"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "预依赖"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "建议"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "推荐"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "冲突"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "替换"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "废弃"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "破坏"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr "增强"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "必需"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "标准"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "可选"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "额外"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "正在分析软件包的依赖关系树"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "候选版本"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "生成依赖关系"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "正在读取状态信息"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "无法打开状态文件 %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "无法写入临时状态文件 %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "无法解析软件包文件 %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "无法解析软件包文件 %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
-
-#: apt-pkg/sourcelist.cc:161
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
-
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
-
-#: apt-pkg/sourcelist.cc:175
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
-
-#: apt-pkg/sourcelist.cc:181
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "正在打开 %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "源列表 %2$s 的第 %1$u 行太长了。"
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
-"(%d)"
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "无法打开文件 %s"
-
-#: apt-pkg/packagemanager.cc:570
-#, 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 ""
-"由于这次安装存在着一个 Conflicts/Pre-Depends 循环，因而需要暂时删除一个必不可"
-"少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
-"Force-LoopBreak 选项。"
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "不支持索引文件类型“%s”"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
-"缘故。"
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
-"系。"
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "软件包列表的目录 %spartial 缺失。"
-
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "仓库目录 %spartial 确实。"
-
-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "无法对目录 %s 加锁"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "正在下载第 %li 个文件，共 %li 个"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "不支持“%s”打包系统"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "无法确定适合的打包系统类型"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "无法读取 %s 的状态。"
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "无法解析或打开软件包的列表或是状态文件。"
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "您可能需要运行 apt-get update 来解决这些问题"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "无法读取源列表。"
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "无法识别锁定的类型 %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "没有为版本锁定指定优先级(或为零)"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "处理 %s (FindPkg)时出错"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "哇，软件包数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "无法获取源软件包列表 %s 的状态"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "正在读取软件包列表"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "正在收集文件所提供的软件包"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "无法写入 %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "无法读取或写入软件源缓存"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Hash 校验和不符"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "大小不符"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "无效的操作 %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "无法解析软件包仓库 Release 文件 %s"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下 ID 的密钥没有可用的公钥：\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3020,12 +2182,12 @@ msgstr ""
 "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG 错误：%s: %s"
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3034,82 +2196,143 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "无法解析软件包仓库 Release 文件 %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "软件提供者数据块内 %s 没有包含指纹信息"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
+msgid "List directory %spartial is missing."
+msgstr "软件包列表的目录 %spartial 缺失。"
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+msgid "Archives directory %spartial is missing."
+msgstr "仓库目录 %spartial 确实。"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
+msgid "Unable to lock directory %s"
+msgstr "无法对目录 %s 加锁"
 
-#: apt-pkg/indexrecords.cc:144
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "软件提供者数据块内 %s 没有包含指纹信息"
+msgid "Retrieving file %li of %li"
+msgstr "正在下载第 %li 个文件，共 %li 个"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:422
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "无法识别锁定的类型 %s"
+
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "没有为版本锁定指定优先级(或为零)"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
+"(%d)"
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "无法打开文件 %s"
+
+#: apt-pkg/packagemanager.cc:577
+#, 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 ""
+"由于这次安装存在着一个 Conflicts/Pre-Depends 循环，因而需要暂时删除一个必不可"
+"少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
+"Force-LoopBreak 选项。"
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "源列表 %2$s 的第 %1$u 行太长了。"
+
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "正在卸载 CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "正在卸载 CD-ROM 文件系统\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "等待插入盘片……\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "正在挂载 CD-ROM 文件系统……\n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "正在鉴别.. "
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "正在鉴别... "
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "已归档文件的标签：%s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "正在卸载 CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "正在盘片中查找索引文件..\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "正在盘片中查找索引文件...\n"
 
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3118,7 +2341,7 @@ msgstr ""
 "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
 "名\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3126,16 +2349,16 @@ msgstr ""
 "无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
 "架。"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "找到标签 '%s'\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "这不是一个有效的名字，请重试。\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3144,302 +2367,1111 @@ msgstr ""
 "这张盘片现在的名字是：\n"
 "“%s”\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "正在复制软件包列表……"
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "正在写入新的源列表\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "对应于该盘片的软件源设置项是：\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "已写入 %i 条记录。\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
+"缘故。"
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
+"系。"
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在分析软件包的依赖关系树"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候选版本"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "生成依赖关系"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在读取状态信息"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
+msgid "Failed to open StateFile %s"
+msgstr "无法打开状态文件 %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入临时状态文件 %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "无法找到认证记录：%s"
+msgid "Unable to parse package file %s (1)"
+msgstr "无法解析软件包文件 %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash 校验和不符：%s"
+msgid "Unable to parse package file %s (2)"
+msgstr "无法解析软件包文件 %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”发布版本"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "无法找到任务 %s"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "无法按照正则表达式 %s 找到任何软件包"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "无法按照正则表达式 %s 找到任何软件包"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "无法从完全虚拟的软件包 %s 中选择版本"
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "因为软件包 %s 没有候选版本，无法进行选择"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "无法解析软件包仓库 Release 文件 %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
+
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr "正在运行 dpkg"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "正在打开 %s"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, c-format
 msgid "Completely removing %s"
 msgstr "完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "注意到 %s 已经消失"
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "无法打开文件 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "无法写入 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖问题 - 保持未配置"
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr "未锁定"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li小时 %li分 %li秒"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li秒"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "找不到您选则的 %s"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "由于文件系统为只读，因而无法使用文件锁 %s"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "无法打开锁文件 %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "无法在 nfs 文件系统上使用文件锁 %s"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "无法获得锁 %s"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "子进程 %s 发生了段错误"
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "子进程 %s 收到信号 %u。"
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "子进程 %s 返回了一个错误号 (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "子进程 %s 异常退出"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "关闭 gzip %s 文件出错"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "无法打开文件 %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "无法打开文件描述符 %d"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "无法创建子进程的 IPC 管道"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "无法执行压缩程序"
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "读取文件出错，还剩 %lu 字节没有读出"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "写入文件出错，还剩 %lu 字节没有保存"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "关闭文件 %s 出错"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "重命名文件 %s 为 %s 出错"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "用 unlink 删除文件 %s 出错"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "同步文件出错"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... 有错误！"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... 完成"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... 完成"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "无法 mmap 一个空文件"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "无法为复制文件描述符 %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "无法 mmap %lu 字节的数据"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "无法关闭 mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "无法同步 mmap "
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "无法 mmap %lu 字节的数据"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "无法截断文件"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 "
+"apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "无法读取文件系统挂载点 %s 的状态"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "无法读取盘片的状态"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "无法识别的类型缩写：“%c”"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "正在打开配置文件 %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "语法错误 %s:%u：配置小节没有以名字开头"
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "语法错误 %s:%u：标签格式有误"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "语法错误 %s:%u：Included from here"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "语法错误 %s:%u：不支持的指令“%s”"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s 中没有安装密钥环。"
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "未知的命令行选项“%c” [来自 %s]"
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "无法识别命令行选项 %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "命令行选项 %s 不是布尔值"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "选项 %s 要求有一个参数"
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "选项“%s”太长"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "不能识别参数 %s，请用 true 或 false"
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "无效的操作 %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
+"\n"
+"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
+"信息的工具\n"
+"\n"
+"选项：\n"
+"  -h   本帮助文本\n"
+"  -t   设置 temp 目录\n"
+"  -c=? 读指定的配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "无法读取 %s 的状态"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "软件包的扩展列表太长"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "处理目录 %s 时出错"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "源扩展列表太长"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "将头写入到目录文件时出错"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "处理目录 %s 时出错"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"用法： apt-ftparchive [选项] 命令\n"
+"命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
+"       sources 源代码包搜索路径 [overridefile [路径前缀]]\n"
+"       contents 搜索路径\n"
+"       release 搜索路径\n"
+"       generate 配置文件 [groups]\n"
+"       clean 配置文件\n"
+"\n"
+"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
+"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n"
+"和 dpkg-scansources，都能游刃有余\n"
+"\n"
+"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
+"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
+"还有软件包的所有控制字段的内容。该软件同时支持 override 文件，\n"
+"通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
+"\n"
+"与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"
+"可以通过使用 --source-override 选项来指定一个 override 文件\n"
+"\n"
+"使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"
+"二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n"
+"应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
+"下面有个来自 Debian 文档的例子：\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"选项:\n"
+"  -h    本帮助文档\n"
+"  --md5 使之生成 MD5 校验和\n"
+"  -s=?  源代码包 override 文件\n"
+"  -q    输出精简信息\n"
+"  -d=?  指定可选的缓存数据库\n"
+"  -d=?  使用另一个可选的缓存数据库\n"
+"  --no-delink 开启delink的调试模式\n"
+"  --contents  使之生成控制内容文件\n"
+"  -c=?  读取指定配置文件\n"
+"  -o=?  设置任意指定的配置选项"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "没有任何选定项是匹配的"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "软件包文件组“%s”中缺少一些文件"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "数据库已过期，现尝试进行升级 %s"
+
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "无法打开数据库文件 %s：%s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "归档文件没有包含控制字段"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "无法获得游标"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "警告：无法读取目录 %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "警告：无法获得 %s 的状态\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "错误："
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "警告："
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "错误：处理文件时出错 "
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "无法解析 %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "无法遍历目录树"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "无法打开 %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "无法读取符号链接 %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "无法使用 unlink 删除 %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** 无法将 %s 链接到 %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " 达到了 DeLink 的上限 %sB。\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "归档文件没有包含 package 字段"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s 中没有 override 项\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s 的维护者 %s 并非 %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s 没有源代码的 override 项\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s 中没有二进制文件的 override 项\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - 分配内存失败"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "无法打开 %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "无法读取 override 文件 %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "未知的压缩算法“%s”"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "无法创建 FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "无法 fork"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "压缩子进程"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "内部错误，无法创建 %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "无法对子进程或文件进行读写"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "在计算 MD5 校验和时无法读取数据"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "在使用 unlink 删除 %s 时出错"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
+"\n"
+"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
+"信息的工具\n"
+"\n"
+"选项：\n"
+"  -h   本帮助文本\n"
+"  -t   设置 temp 目录\n"
+"  -c=? 读指定的配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "未知的软件包记录！"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
+"\n"
+"apt-sortpkgs 是对软件包索引文件内容进行排序的简单工具。-s 选项\n"
+"是用来指出后面参数所示文件是哪种文件。\n"
+"\n"
+"选项：\n"
+"  -h   本帮助文档\n"
+"  -s   根据源文件排序\n"
+"  -c=? 读取指定配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s 不是一个有效的 DEB 软件包。"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1c88254ff..3a446ac4e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-23 00:29+0100\n"
+"POT-Creation-Date: 2014-05-05 16:26+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."
@@ -18,154 +18,155 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "套件 %s 版本 %s 未能滿足相依性：\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
 msgid "Total package names: "
 msgstr "套件名稱合計："
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "套件名稱合計："
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  一般套件："
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  完全虛擬套件："
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  單一虛擬套件："
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  混合虛擬套件："
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  找不到："
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "個別版本合計："
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 msgid "Total distinct descriptions: "
 msgstr "個別版本類別合計："
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "相依關係合計："
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "版本/檔案關聯合計："
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 msgid "Total Desc/File relations: "
 msgstr "類別/檔案關聯合計："
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr "提供者對應合計："
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr "所有字串合計："
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr "相依版本空間合計："
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr "間暇空間合計："
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 msgid "Total space accounted for: "
 msgstr "統計後的空間合計："
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:55
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "套件檔 %s 未同步。"
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "未找到套件"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1254
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "您必須明確得給定一個樣式"
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "找不到套件 %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "套件檔："
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "快取資料未同步，無法 x-ref 套件檔"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1566
 msgid "Pinned packages:"
 msgstr "鎖定的套件："
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr "(未找到)"
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  已安裝："
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr "  候選："
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr "(無)"
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr "  套件鎖定："
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 msgid "  Version table:"
 msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n"
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -238,29 +239,29 @@ msgstr ""
 "  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 "請參閱 apt-cache(8) 及 apt.conf(5) 參考手冊以取得更多資訊。\n"
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "請替這張光碟取個名字，像是 'Debian 2.1r1 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "請把光碟放入光碟機，然後按下 [Enter] 鍵"
 
-#: cmdline/apt-cdrom.cc:141
+#: cmdline/apt-cdrom.cc:139
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "無法將 %s 更名為 %s"
 
-#: cmdline/apt-cdrom.cc:196
+#: cmdline/apt-cdrom.cc:178
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "請對您的光碟組中的其它光碟重複相同的操作。"
 
@@ -296,65 +297,65 @@ msgstr ""
 "  -c=? 讀取指定的設定檔\n"
 "  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "無法找到套件 %s"
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "無法找到套件 %s"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "無法找到套件 %s"
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "無法取得來源套件列表 %s 的狀態"
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "無法找到套件 %s"
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr "內部錯誤，問題排除器造成了損壞"
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載目錄"
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
 msgid "Must specify at least one package to fetch source for"
 msgstr "在取得原始碼時必須至少指定一個套件"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "無法找到 %s 的原始碼套件"
@@ -374,114 +375,114 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "略過已下載的檔案 '%s'\n"
 
-#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "無法確認 %s 的未使用空間"
 
-#: cmdline/apt-get.cc:877
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "在 %s 裡沒有足夠的的未使用空間"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下載 %sB/%sB 的原始套件檔。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:888
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下載 %sB 的原始套件檔。\n"
 
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "取得原始碼 %s\n"
 
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:912
 msgid "Failed to fetch some archives."
 msgstr "無法取得某些套件檔。"
 
-#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr "下載完成，且這是『僅下載』模式"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "不解開，因原始碼已解開至 %s\n"
 
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "解開指令 '%s' 失敗。\n"
 
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "編譯指令 '%s' 失敗。\n"
 
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:1002
 msgid "Child process failed"
 msgstr "子程序失敗"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1021
 msgid "Must specify at least one package to check builddeps for"
 msgstr "在檢查編譯相依關係時必須至少指定一個套件"
 
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1046
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "無法取得 %s 的編譯相依關係資訊"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 沒有編譯相依關係。\n"
 
-#: cmdline/apt-get.cc:1265
+#: cmdline/apt-get.cc:1263
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
 
-#: cmdline/apt-get.cc:1283
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1304
 #, 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:1345
+#: cmdline/apt-get.cc:1343
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -489,37 +490,37 @@ msgid ""
 msgstr ""
 "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1349
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s"
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1387
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 的編譯相依關係。"
 
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1392
 msgid "Failed to process build dependencies"
 msgstr "無法處理編譯相依關係"
 
-#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "正和 %s (%s) 連線"
 
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "已支援模組："
 
-#: cmdline/apt-get.cc:1626
+#: cmdline/apt-get.cc:1624
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -605,53 +606,74 @@ msgstr ""
 "以取得更多資訊和選項。\n"
 "                        該 APT 有著超級牛力。\n"
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "在取得原始碼時必須至少指定一個套件"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "但它卻尚未安裝"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:74
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:76
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:241
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s 已經是最新版本了。\n"
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s 已經是最新版本了。\n"
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1182
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待 %s 但是它並不存在"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "無法開啟 %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -678,7 +700,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -725,173 +747,175 @@ msgstr "無法卸載 %s 裡的光碟片，或許它仍在使用中。"
 msgid "Disk not found."
 msgstr "找不到磁碟。"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
 msgid "File not found"
 msgstr "找不到檔案"
 
-#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
-#: methods/rred.cc:609
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "無法取得狀態"
 
-#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "無法設定修改時間"
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "不正確的 URI，本機 URI 不應以 // 開頭"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "登入中"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr "無法解析對方主機名稱"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr "無法解析本機名稱"
 
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "伺服器不接受連線，並回應：%s"
 
-#: methods/ftp.cc:220
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:227
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:247
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "指定了代理伺服器，但沒有指定登入 script，Acquire::ftp::ProxyLogin 是空的。"
 
-#: methods/ftp.cc:275
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "登入 script 指令 '%s' 失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:301
+#: methods/ftp.cc:306
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr "連線逾時"
 
-#: methods/ftp.cc:345
+#: methods/ftp.cc:350
 msgid "Server closed the connection"
 msgstr "伺服器已關閉連線"
 
-#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: methods/ftp.cc:355 methods/rsh.cc:205
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "回應超過緩衝區長度。"
 
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:377 methods/ftp.cc:389
 msgid "Protocol corruption"
 msgstr "協定失敗"
 
-#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "寫入錯誤"
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr "無法建立 Socket"
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:712
 msgid "Could not connect data socket, connection timed out"
 msgstr "無法和 data socket 連線，連線逾時"
 
-#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
 msgid "Failed"
 msgstr "失敗"
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr "無法和 passive socket 連線。"
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo 無法取得監聽 socket"
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr "無法 bind 至 socket"
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr "無法監聽 socket"
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr "無法解析 socket 名稱"
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr "無法送出 PORT 指令"
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "未知的地址家族 %u (AF_*)"
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr "Data socket 連線逾時"
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr "無法接受連線"
 
-#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr "有問題的雜湊檔"
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "無法取得檔案，伺服器回應 '%s'"
 
-#: methods/ftp.cc:900 methods/rsh.cc:331
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr "Data socket 連線逾時"
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "資料傳輸失敗，伺服器回應 '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1009
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr "查詢"
 
-#: methods/ftp.cc:1123
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr "無法 invoke "
 
@@ -927,7 +951,7 @@ msgstr "無法和 %s:%s (%s) 連線。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "正連線至 %s"
@@ -957,182 +981,416 @@ msgstr "在解析 '%s:%s' (%i) 時出了怪事"
 msgid "Unable to connect to %s:%s:"
 msgstr "無法連線至 %s %s："
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！"
 
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr "至少發現一個無效的簽章。"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:174
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:182
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr "在執行 gpgv 時發生未知的錯誤"
 
-#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 msgid "The following signatures were invalid:\n"
 msgstr "以下簽名無效：\n"
 
-#: methods/gpgv.cc:229
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:516
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr "在寫入該檔時發生錯誤"
 
-#: methods/http.cc:530
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線"
 
-#: methods/http.cc:532
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr "在讀取伺服器時發生錯誤"
 
-#: methods/http.cc:568
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr "在寫入檔案時發生錯誤"
 
-#: methods/http.cc:628
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr "選擇失敗"
 
-#: methods/http.cc:633
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr "連線逾時"
 
-#: methods/http.cc:656
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr "在寫入輸出檔時發生錯誤"
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "等待標頭"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr "標頭行錯誤"
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP 伺服器傳送了一個無效的回覆標頭"
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP 伺服器傳送了一個無效的 Content-Length 標頭"
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP 伺服器傳送了一個無效的 Content-Range 標頭"
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr "這個 HTTP 伺服器的範圍支援有問題"
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "未知的資料格式"
 
-#: methods/server.cc:494
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr "錯誤的標頭資料"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: methods/server.cc:659
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "籌備升級中... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "內部錯誤，AllUpgrade 造成了損壞"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "完成"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "正在修正相依關係..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失敗。"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "無法修正相依關係"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "無法將升級計劃最小化"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "未能滿足相依關係。試試 -f 選項。"
+
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:236
+#, fuzzy
+msgid "[installed,local]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr "下列的套件有未滿足的相依關係："
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "但 %s 卻已安裝"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "但 %s 卻將被安裝"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "但它卻無法安裝"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "但它是虛擬套件"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "但它卻尚未安裝"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "但它卻將不會被安裝"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr "或"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】套件將會被安裝："
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "下列套件將會被【移除】："
+
+#: apt-private/private-output.cc:537
+msgid "The following packages have been kept back:"
+msgstr "下列套件將會維持其原有版本："
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
+msgstr "下列套件將會被升級："
+
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列套件將會被【降級】："
+
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
+msgstr "下列被保留 (hold) 的套件將會被更改："
+
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s（因為 %s）"
+
+#: apt-private/private-output.cc:662
+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"
+"除非您很清楚您在做什麼，否則請勿輕易嘗試！"
+
+#: apt-private/private-output.cc:693
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升級 %lu 個，新安裝 %lu 個，"
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "重新安裝 %lu 個，"
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr "降級 %lu 個，"
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "移除 %lu 個，有 %lu 個未被升級。\n"
+
+#: apt-private/private-output.cc:705
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu 個沒有完整得安裝或移除。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:727
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "編譯正規表示式時發生錯誤 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update 指令不需任何參數"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！"
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有套件需要被移除，但卻被禁止移除。"
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr "內部錯誤，排序未能完成"
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr "怪哉... 檔案大小不符，請發信給 apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:154
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "需要下載 %sB/%sB 的套件檔。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:159
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "需要下載 %sB 的套件檔。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:178
+#: apt-private/private-install.cc:166
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "此操作完成之後，會多佔用 %sB 的磁碟空間。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n"
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:199
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "在 %s 裡沒有足夠的的未使用空間。"
 
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
 msgid "There are problems and -y was used without --force-yes"
 msgstr "發生了問題，且 -y 並沒有和 --force-yes 搭配使用"
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "雖然指定了 Trivial Only（自動答 NO）選項，但這並不是 trivial 操作。"
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:231
+#: apt-private/private-install.cc:219
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1143,20 +1401,20 @@ msgstr ""
 "請輸入 '%s' 這個句子以繼續進行\n"
 " ?] "
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
 msgid "Abort."
 msgstr "放棄執行。"
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "是否繼續進行 [Y/n]？"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
 msgid "Some files failed to download"
 msgstr "有部份檔案無法下載"
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1164,19 +1422,19 @@ msgstr ""
 "有部份套件檔無法取得，試著執行 apt-get update 或者試著加上 --fix-missing 選"
 "項？"
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目前尚未支援 --fix-missing 和媒體抽換"
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:328
 msgid "Unable to correct missing packages."
 msgstr "無法修正欠缺的套件。"
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
 msgid "Aborting install."
 msgstr "放棄安裝。"
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1186,15 +1444,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover"
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1212,15 +1470,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
 msgid "The following information may help to resolve the situation:"
 msgstr "以下的資訊或許有助於解決當前的情況："
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:505
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "內部錯誤，AutoRemover 處理失敗"
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1230,7 +1488,7 @@ msgid_plural ""
 msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了："
 msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
 
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1238,18 +1496,18 @@ msgid_plural ""
 msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了："
 msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
 
-#: apt-private/private-install.cc:530
+#: apt-private/private-install.cc:518
 #, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "使用 'apt-get autoremove' 來將其移除。"
 msgstr[1] "使用 'apt-get autoremove' 來將其移除。"
 
-#: apt-private/private-install.cc:624
+#: apt-private/private-install.cc:612
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "您也許得執行 'apt-get -f install' 以修正這些問題："
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:614
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1257,7 +1515,7 @@ msgstr ""
 "未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解"
 "決方案）。"
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
 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"
@@ -1267,318 +1525,92 @@ msgstr ""
 "有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n"
 "unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。"
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
 msgid "Broken packages"
 msgstr "損毀的套件"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
 msgid "The following extra packages will be installed:"
 msgstr "下列的額外套件將被安裝："
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
 msgid "Suggested packages:"
 msgstr "建議套件："
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
 msgid "Recommended packages:"
 msgstr "推薦套件："
 
-#: apt-private/private-download.cc:32
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-download.cc:31
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "【警告】：無法驗證下列套件！"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
 msgid "Authentication warning overridden.\n"
 msgstr "忽略了驗證警告。\n"
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
 msgid "Some packages could not be authenticated"
 msgstr "有部份套件無法驗證"
 
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
 msgid "Install these packages without verification?"
 msgstr "是否不經驗證就安裝這些套件？"
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "無法取得 %s，%s\n"
 
-#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
-#: apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:201
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:205
-#, fuzzy
-msgid "[installed,local]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:208
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:210
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:212
-#, fuzzy
-msgid "[installed]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:216
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:320
-msgid "The following packages have unmet dependencies:"
-msgstr "下列的套件有未滿足的相依關係："
-
-#: apt-private/private-output.cc:410
-#, c-format
-msgid "but %s is installed"
-msgstr "但 %s 卻已安裝"
-
-#: apt-private/private-output.cc:412
-#, c-format
-msgid "but %s is to be installed"
-msgstr "但 %s 卻將被安裝"
-
-#: apt-private/private-output.cc:419
-msgid "but it is not installable"
-msgstr "但它卻無法安裝"
-
-#: apt-private/private-output.cc:421
-msgid "but it is a virtual package"
-msgstr "但它是虛擬套件"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not installed"
-msgstr "但它卻尚未安裝"
-
-#: apt-private/private-output.cc:424
-msgid "but it is not going to be installed"
-msgstr "但它卻將不會被安裝"
-
-#: apt-private/private-output.cc:429
-msgid " or"
-msgstr "或"
-
-#: apt-private/private-output.cc:458
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】套件將會被安裝："
-
-#: apt-private/private-output.cc:484
-msgid "The following packages will be REMOVED:"
-msgstr "下列套件將會被【移除】："
-
-#: apt-private/private-output.cc:506
-msgid "The following packages have been kept back:"
-msgstr "下列套件將會維持其原有版本："
-
-#: apt-private/private-output.cc:527
-msgid "The following packages will be upgraded:"
-msgstr "下列套件將會被升級："
-
-#: apt-private/private-output.cc:548
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列套件將會被【降級】："
-
-#: apt-private/private-output.cc:568
-msgid "The following held packages will be changed:"
-msgstr "下列被保留 (hold) 的套件將會被更改："
-
-#: apt-private/private-output.cc:623
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s（因為 %s）"
-
-#: apt-private/private-output.cc:631
-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"
-"除非您很清楚您在做什麼，否則請勿輕易嘗試！"
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "升級 %lu 個，新安裝 %lu 個，"
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "重新安裝 %lu 個，"
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%lu downgraded, "
-msgstr "降級 %lu 個，"
-
-#: apt-private/private-output.cc:670
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "移除 %lu 個，有 %lu 個未被升級。\n"
-
-#: apt-private/private-output.cc:674
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu 個沒有完整得安裝或移除。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:702
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:713
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:719
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "編譯正規表示式時發生錯誤 - %s"
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "正在修正相依關係..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr " 失敗。"
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "無法修正相依關係"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr "無法將升級計劃最小化"
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " 完成"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "未能滿足相依關係。試試 -f 選項。"
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr "update 指令不需任何參數"
-
-#: apt-private/private-upgrade.cc:19
-msgid "Calculating upgrade... "
-msgstr "籌備升級中... "
-
-#: apt-private/private-upgrade.cc:24
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "內部錯誤，AllUpgrade 造成了損壞"
-
-#: apt-private/private-upgrade.cc:26
-msgid "Done"
-msgstr "完成"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
-msgstr ""
-
-#: apt-private/private-show.cc:152
-#, c-format
-msgid "There is %lu additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:159
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:19
-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 ""
-
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "無法將 %s 更名為 %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:63
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "已有 "
 
-#: apt-private/acqprogress.cc:87
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr "下載:"
 
-#: apt-private/acqprogress.cc:118
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr "略過 "
 
-#: apt-private/acqprogress.cc:122
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr "錯誤 "
 
-#: apt-private/acqprogress.cc:143
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "取得 %sB 用了 %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:233
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [工作中]"
 
-#: apt-private/acqprogress.cc:294
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1591,19 +1623,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
-#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr "無法讀取 %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr "無法切換至 %s"
@@ -1632,11 +1664,11 @@ msgstr "無法開啟檔案 %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "無法和子程序建立 IPC 管線"
 
-#: methods/rsh.cc:339
+#: methods/rsh.cc:343
 msgid "Connection closed prematurely"
 msgstr "連線突然終止"
 
@@ -1676,1337 +1708,473 @@ msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]"
 msgid "Merging available information"
 msgstr "整合現有的資料"
 
-#: cmdline/apt-extracttemplates.cc:224
-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 ""
-"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
-"\n"
-"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n"
-"的工具\n"
-"\n"
-"選項\n"
-"  -h   本幫助訊息。\n"
-"  -t   指定暫存目錄\n"
-"  -c=? 讀取指定的設定檔\n"
-"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "無法寫入 %s"
-
-#: cmdline/apt-extracttemplates.cc:298
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "無法取得 debconf 版本。是否有安裝 debconf？"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
-msgstr "套件延伸列表過長"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
-#, c-format
-msgid "Error processing directory %s"
-msgstr "處理目錄 %s 時發生錯誤"
-
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
-msgstr "原始碼的延伸列表太長"
-
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
-msgstr "寫入標頭資訊到內容檔時發生錯誤"
-
-#: ftparchive/apt-ftparchive.cc:409
-#, c-format
-msgid "Error processing contents %s"
-msgstr "處理內容 %s 時發生錯誤"
-
-#: ftparchive/apt-ftparchive.cc:597
-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 ""
-"用法：apt-ftparchive [選項] 指令\n"
-"指令：packages 二進制檔搜索路徑 [重新定義檔 [路徑前綴]]\n"
-"      sources 原始碼搜索路徑 [重新定義檔 [路徑前綴]]\n"
-"      contents 搜索路徑\n"
-"      release 搜索路徑\n"
-"      generate 設定檔 [群組]\n"
-"      clean 設定檔\n"
-"\n"
-"apt-ftparchive 可用來替 Debian 套件庫建立索引檔。它支援了從全\n"
-"自動化到足以替代 dpkg-scanpackages 及 dpkg-scansources 所提供\n"
-"的所有功能等等各式各樣建立索引的方式。apt-ftparchive 會根據 .deb 檔案樹建立 "
-"Package 檔。Package 檔\n"
-"裡不僅包含了每個套件的 control 資料的內容，還包含了 MD5 檢驗\n"
-"碼和檔案大小。它還支援了重新定義檔，可用來強制指定優先等級及\n"
-"其所屬的類別。\n"
-"\n"
-"而同樣的，apt-ftparchive 也能根據 .dsc 檔案樹生成 Source 檔。\n"
-"可用 --source-override 選項來指定一個 src 重新定義檔。\n"
-"\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"
-"  -h    本幫助說明\n"
-"  --md5 控制如何產生 MD5 檢驗碼\n"
-"  -s=?  原始碼的重新定義檔\n"
-"  -q    安靜模式\n"
-"  -d=?  指定搭配的快取資料庫\n"
-"  --no-delink 啟用 DeLinking 模式\n"
-"  --contents  產生控制內容檔\n"
-"  -c=?  讀取指定的設定檔\n"
-"  -o=?  指定任意的設定選項"
-
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
-msgstr "找不到符合的選項"
-
-#: ftparchive/apt-ftparchive.cc:881
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "套件檔案組 `%s' 少了部份檔案"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB 已損毀，檔案被更名為 %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB 過舊，嘗試升級 %s"
-
-#: ftparchive/cachedb.cc:76
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。"
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "無法開啟 DB 檔 %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
-#, c-format
-msgid "Failed to stat %s"
-msgstr "無法取得 %s 的狀態"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "套件檔沒有 control 記錄"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "無法取得遊標"
-
-#: ftparchive/writer.cc:82
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "警告：無法讀取目錄 %s\n"
-
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "警告：無法取得 %s 狀態\n"
-
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr "錯誤："
-
-#: ftparchive/writer.cc:145
-msgid "W: "
-msgstr "警告："
-
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
-msgstr "錯誤：套用到檔案時發生錯誤"
-
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "無法解析 %s"
-
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
-msgstr "無法走訪目錄樹"
-
-#: ftparchive/writer.cc:210
-#, c-format
-msgid "Failed to open %s"
-msgstr "無法開啟 %s"
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:277
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "無法讀取連結 %s"
-
-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "無法移除連結 %s"
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** 無法將 %s 連結到 %s"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " 達到了 DeLink 的上限 %sB。\n"
-
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
-msgstr "套件檔裡沒有套件資訊"
-
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s 沒有重新定義項目\n"
-
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 的維護者是 %s，而非 %s\n"
-
-#: ftparchive/writer.cc:712
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s 沒有原始碼重新定義項目\n"
-
-#: ftparchive/writer.cc:716
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s 也沒有二元碼重新定義項目\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 無法配置記憶體"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:139
-#, c-format
-msgid "Unable to open %s"
-msgstr "無法開啟 %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:65
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
-
-#: ftparchive/override.cc:124 ftparchive/override.cc:198
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "無法讀取重新定義檔 %s"
-
-#: ftparchive/override.cc:163
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
-
-#: ftparchive/override.cc:175
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2"
-
-#: ftparchive/override.cc:188
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "未知的壓縮演算法 '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "要壓縮輸出 %s 需搭配壓縮動作"
-
-#: ftparchive/multicompress.cc:190
-msgid "Failed to create FILE*"
-msgstr "無法建立 FILE*"
-
-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "fork 時失敗"
-
-#: ftparchive/multicompress.cc:207
-msgid "Compress child"
-msgstr "壓縮子程序"
-
-#: ftparchive/multicompress.cc:230
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "內部錯誤，無法建立 %s"
-
-#: ftparchive/multicompress.cc:303
-msgid "IO to subprocess/file failed"
-msgstr "和子程序/檔案 IO 失敗"
-
-#: ftparchive/multicompress.cc:341
-msgid "Failed to read while computing MD5"
-msgstr "在計算 MD5 時無法讀取到資料"
-
-#: ftparchive/multicompress.cc:357
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "在取消 %s 的連結時發生問題"
-
-#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "無法將 %s 更名為 %s"
-
-#: cmdline/apt-internal-solver.cc:38
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
-"\n"
-"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n"
-"的工具\n"
-"\n"
-"選項\n"
-"  -h   本幫助訊息。\n"
-"  -t   指定暫存目錄\n"
-"  -c=? 讀取指定的設定檔\n"
-"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "未知的套件記錄！"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法：apt-sortpkgs [選項] 檔案1 [檔案2 ...]\n"
-"\n"
-"apt-sortpkgs 是用來排序套件檔的簡單工具。-s 選項是用來指定它的檔案類型。\n"
-"\n"
-"選項：\n"
-"  -h   本幫助訊息。\n"
-"  -s   根據原始檔排序\n"
-"  -c=? 讀取指定的設定檔\n"
-"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:122
-msgid "Failed to create pipes"
-msgstr "無法建立管線"
-
-#: apt-inst/contrib/extracttar.cc:149
-msgid "Failed to exec gzip "
-msgstr "無法執行 gzip"
-
-#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
-msgid "Corrupted archive"
-msgstr "損毀的套件檔"
-
-#: apt-inst/contrib/extracttar.cc:201
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar checksum 失敗，套件檔已損毀"
-
-#: apt-inst/contrib/extracttar.cc:306
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "未知的 TAR 標頭類型 %u，成員 %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "無效的套件庫簽章"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "讀取套件檔的成員標頭訊息時發生錯誤"
-
-#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "無效的套件檔成員標頭"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "無效的套件檔成員標頭"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "套件檔過短"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
-msgstr "讀取套件檔標頭失敗"
-
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode 在還有連結結點時被呼叫"
 
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "找不到雜湊元件！"
 
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "在配置抽換資訊時失敗"
 
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "在 AddDiversion 發生了內部錯誤"
 
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "試圖改寫抽換資訊，%s -> %s 和 %s/%s"
 
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "重複加入抽換資訊 %s -> %s"
 
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "重複的設定檔 %s/%s"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr "寫入檔案 %s 失敗"
-
-#: apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "關閉檔案 %s 失敗"
-
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
 msgid "The path %s is too long"
 msgstr "路徑 %s 過長"
 
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "解開 %s 超過一次"
 
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "路徑 %s 已被抽換"
 
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "此套件試圖寫至抽換後的目標 %s/%s"
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
 msgid "The diversion path is too long"
 msgstr "要進行抽換的路徑過長"
 
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
+#, c-format
+msgid "Failed to stat %s"
+msgstr "無法取得 %s 的狀態"
+
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "無法將 %s 更名為 %s"
+
+#: apt-inst/extract.cc:249
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "目錄 %s 已經被非目錄的檔案所取代"
 
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
 msgid "Failed to locate node in its hash bucket"
 msgstr "在雜湊表中找不到節點"
 
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
 msgid "The path is too long"
 msgstr "路徑過長"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "以無版本的 %s 覆寫原始套件"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
 #, c-format
 msgid "Unable to stat %s"
 msgstr "無法取得 %s 的狀態"
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
-#: apt-inst/deb/debfile.cc:57
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "寫入檔案 %s 失敗"
+
+#: apt-inst/dirstream.cc:105
+#, c-format
+msgid "Failed to close file %s"
+msgstr "關閉檔案 %s 失敗"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "這是個不正確的 DEB 套件檔，沒有 '%s' 成員"
 
-#: apt-inst/deb/debfile.cc:124
+#: apt-inst/deb/debfile.cc:132
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "內部錯誤，找不找到成員 %s"
 
-#: apt-inst/deb/debfile.cc:219
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr "無法分析的 control 檔"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "不能 mmap 空白檔案"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "無效的套件庫簽章"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "無法開啟管線給 %s 使用"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "讀取套件檔的成員標頭訊息時發生錯誤"
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "無法 mmap 到 %lu 位元組"
+msgid "Invalid archive member header %s"
+msgstr "無效的套件檔成員標頭"
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "無法開啟 %s"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "無效的套件檔成員標頭"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "無法 invoke "
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "套件檔過短"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "無法 mmap 到 %lu 位元組"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "讀取套件檔標頭失敗"
 
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
-msgstr "無法截短檔案"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr "無法建立管線"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"動態 MMap 已用完所有空間。請增加 APT::Cache-Start 的大小。目前大小為：%lu。"
-"(man 5 apt.conf)"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "無法執行 gzip"
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "損毀的套件檔"
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar checksum 失敗，套件檔已損毀"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "未知的 TAR 標頭類型 %u，成員 %s"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "無法取得 %s 的狀態。"
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "%limin %lis"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
-#, c-format
-msgid "Selection %s not found"
-msgstr "選項 %s 找不到"
-
-#: apt-pkg/contrib/configuration.cc:503
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "無法辨識的縮寫類型：'%c'"
-
-#: apt-pkg/contrib/configuration.cc:617
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "開啟設定檔 %s"
-
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "語法錯誤 %s:%u：區塊開頭沒有名稱。"
-
-#: apt-pkg/contrib/configuration.cc:804
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "語法錯誤 %s:%u：標籤格式錯誤"
-
-#: apt-pkg/contrib/configuration.cc:821
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "語法錯誤 %s:%u：數值後有多餘的垃圾"
-
-#: apt-pkg/contrib/configuration.cc:861
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "語法錯誤 %s:%u：指令只能於最高層級執行"
+msgid "Packaging system '%s' is not supported"
+msgstr "不支援的套件包裝系統 '%s'"
 
-#: apt-pkg/contrib/configuration.cc:868
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "語法錯誤 %s:%u: 太多巢狀引入檔"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "無法確認合適的套件包裝系統類型"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "語法錯誤 %s:%u：從此引入"
+msgid "Wrote %i records.\n"
+msgstr "寫入 %i 筆紀錄。\n"
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "語法錯誤 %s:%u：不支援的指令 '%s'"
-
-#: apt-pkg/contrib/configuration.cc:884
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "語法錯誤 %s:%u：指令只能於最高層級執行"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n"
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "語法錯誤 %s:%u：在檔案結尾有多餘的垃圾"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n"
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... 錯誤！"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n"
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... 完成"
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... 完成"
-
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "未知的命令列選項 '%c' [來自 %s]。"
-
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "無法理解的命令列選項 %s"
-
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "命令列選項 %s 不是 boolean 值"
-
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "需替選項 %s 指定參數。"
-
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "選項 %s：在指定設定項目時應該有 =<val>。"
-
-#: apt-pkg/contrib/cmndline.cc:273
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "選項 %s 的參數應該是數字，而不是 '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "選項 %s 太長"
-
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "偵測器 %s 無法理解，試試 true 或 false。"
-
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
-msgstr "無效的操作 %s"
-
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "無法取得掛載點 %s 的狀態"
-
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr "無法取得 CD-ROM 的狀態"
-
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "在關閉檔案時發生問題"
-
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "不在唯讀檔案 %s 上使用檔案鎖定"
-
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "無法開啟鎖定檔 %s"
-
-#: apt-pkg/contrib/fileutl.cc:256
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定"
-
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
-msgstr "無法將 %s 鎖定"
-
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:459
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgid "Hash mismatch for: %s"
+msgstr "Hash Sum 不符"
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "子程序 %s 收到一個記憶體錯誤。"
+msgid "The method driver %s could not be found."
+msgstr "找不到安裝方式的驅動程式 %s。"
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "子程序 %s 收到一個記憶體錯誤。"
-
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "子程序 %s 傳回錯誤碼 (%u)"
+msgid "Is the package %s installed?"
+msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "子程序 %s 不預期得結束"
+msgid "Method %s did not start correctly"
+msgstr "安裝方式 %s 沒有正確啟動"
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Could not open file %s"
-msgstr "無法開啟檔案 %s"
-
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "無法開啟管線給 %s 使用"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr "無法建立子程序 IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
-msgstr "無法執行壓縮程式"
-
-#: apt-pkg/contrib/fileutl.cc:1326
-#, fuzzy, c-format
-msgid "read, still have %llu to read but none left"
-msgstr "讀取，仍有 %lu 未讀但已無空間"
-
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "寫入，仍有 %lu 待寫入但已沒辨法"
-
-#: apt-pkg/contrib/fileutl.cc:1723
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "在關閉檔案時發生問題"
-
-#: apt-pkg/contrib/fileutl.cc:1735
-#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "在同步檔案時發生問題"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"
 
-#: apt-pkg/contrib/fileutl.cc:1746
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "在刪除檔案時發生問題"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "無法分析或開啟套件清單或狀況檔。"
 
-#: apt-pkg/contrib/fileutl.cc:1759
-msgid "Problem syncing the file"
-msgstr "在同步檔案時發生問題"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "您也許得執行 apt-get update 以修正這些問題"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "放棄安裝。"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "無法讀取來源列表。"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
 msgstr "清空套件快取"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
 msgid "The package cache file is corrupted"
 msgstr "套件快取檔損壞"
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache file is an incompatible version"
 msgstr "套件快取檔版本不符"
 
-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "套件快取檔損壞"
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本 APT 不支援 '%s' 版本系統"
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:179
 msgid "The package cache was built for a different architecture"
 msgstr "這個套件快取是用於另一種平台的"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Depends"
 msgstr "相依關係"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "PreDepends"
 msgstr "預先相依關係"
 
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
 msgid "Suggests"
 msgstr "建議"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Recommends"
 msgstr "推薦"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Conflicts"
 msgstr "衝突"
 
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
 msgid "Replaces"
 msgstr "取代"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Obsoletes"
 msgstr "廢棄"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Breaks"
 msgstr "毀損"
 
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "required"
 msgstr "必要"
 
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
 msgid "standard"
 msgstr "標準"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "optional"
 msgstr "次要"
 
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
 msgid "extra"
 msgstr "額外"
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "正在重建相依關係"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "候選版本"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "建立相依關係"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "正在讀取狀態資料"
-
-#: apt-pkg/depcache.cc:244
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "無法開啟 StateFile %s"
-
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "無法寫入暫存的 StateFile %s"
-
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "無法辨識套件檔 %s (1)"
-
-#: apt-pkg/tagfile.cc:235
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "無法辨識套件檔 %s (2)"
-
-#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）"
-
-#: apt-pkg/sourcelist.cc:161
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
-
-#: apt-pkg/sourcelist.cc:164
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）"
-
-#: apt-pkg/sourcelist.cc:175
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
-
-#: apt-pkg/sourcelist.cc:181
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
-
-#: apt-pkg/sourcelist.cc:197
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）"
-
-#: apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）"
-
-#: apt-pkg/sourcelist.cc:215
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
-
-#: apt-pkg/sourcelist.cc:326
-#, c-format
-msgid "Opening %s"
-msgstr "正在開啟 %s"
-
-#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
-
-#: apt-pkg/sourcelist.cc:362
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）"
-
-#: apt-pkg/sourcelist.cc:366
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行"
-
-#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行"
-
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "無法開啟檔案 %s"
-
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"此安裝因衝突或預先相依關係，需暫時刪除 %s 這個基本套件。這通常不是好主意，但"
-"若您執意進行，請設定 APT::Force-LoopBreak 選項。"
-
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "不被支援的索引檔類型 '%s'"
 
-#: apt-pkg/algorithms.cc:266
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "套件 %s 需要重新安裝，但找不到它的套件檔。"
-
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"錯誤，pkgProblemResolver::Resolve 的建立中斷了，這可能肇因於保留 (hold) 套"
-"件。"
-
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "無法修正問題，您保留 (hold) 了損毀的套件。"
-
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "找不到清單目錄 %spartial。"
-
-#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "找不到套件檔目錄 %spartial。"
-
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "無法鎖定列表目錄"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "正在取得檔案 %li/%li（還有 %s）"
-
-#: apt-pkg/acquire.cc:895
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "正在取得檔案 %li/%li"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "找不到安裝方式的驅動程式 %s。"
-
-#: apt-pkg/acquire-worker.cc:115
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
-
-#: apt-pkg/acquire-worker.cc:166
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "安裝方式 %s 沒有正確啟動"
-
-#: apt-pkg/acquire-worker.cc:452
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "不支援的套件包裝系統 '%s'"
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr "無法確認合適的套件包裝系統類型"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "無法取得 %s 的狀態。"
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "在 sources.list 中必須包含一些 'source' URI"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "無法分析或開啟套件清單或狀況檔。"
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "您也許得執行 apt-get update 以修正這些問題"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "無法讀取來源列表。"
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:414
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭"
-
-#: apt-pkg/policy.cc:436
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "無法分析鎖定類型 %s"
-
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-msgstr "銷定並沒有優先順序之分（或零）"
-
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:93
 msgid "Cache has an incompatible versioning system"
 msgstr "快取使用的是不相容的版本系統"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "在處理 %s 時發生錯誤 (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。"
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。"
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:263
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:266
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "在計算檔案相依性時找不到套件 %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "無法取得來源套件列表 %s 的狀態"
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
 msgid "Reading package lists"
 msgstr "正在讀取套件清單"
 
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-pkg/pkgcachegen.cc:1316
 msgid "Collecting File Provides"
 msgstr "正在收集檔案提供者"
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "無法寫入 %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
 msgid "IO Error saving source cache"
 msgstr "在儲存來源快取時 IO 錯誤"
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "無法重新命名，%s (%s -> %s)。"
 
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum 不符"
 
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
 msgid "Size mismatch"
 msgstr "大小不符"
 
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
 #, fuzzy
 msgid "Invalid file format"
 msgstr "無效的操作 %s"
 
-#: apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1579
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1586
+#: apt-pkg/acquire-item.cc:1595
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "無法辨別 Release 檔 %s"
 
-#: apt-pkg/acquire-item.cc:1628
+#: apt-pkg/acquire-item.cc:1637
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "無法取得以下的密鑰 ID 的公鑰：\n"
 
-#: apt-pkg/acquire-item.cc:1666
+#: apt-pkg/acquire-item.cc:1675
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1688
+#: apt-pkg/acquire-item.cc:1697
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）"
 
-#: apt-pkg/acquire-item.cc:1718
+#: apt-pkg/acquire-item.cc:1727
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3014,12 +2182,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1856
+#: apt-pkg/acquire-item.cc:1865
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3028,104 +2196,161 @@ msgstr ""
 "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平"
 "台）"
 
-#: apt-pkg/acquire-item.cc:1922
+#: apt-pkg/acquire-item.cc:1931
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1980
+#: apt-pkg/acquire-item.cc:1989
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "Unable to parse Release file %s"
-msgstr "無法辨別 Release 檔 %s"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "提供者區塊 %s 沒有包含指紋碼"
+
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#, fuzzy, c-format
+msgid "List directory %spartial is missing."
+msgstr "找不到清單目錄 %spartial。"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "找不到套件檔目錄 %spartial。"
+
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "無法鎖定列表目錄"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "No sections in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有區段"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "正在取得檔案 %li/%li（還有 %s）"
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+msgid "Retrieving file %li of %li"
+msgstr "正在取得檔案 %li/%li"
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用原有的索引檔。"
+
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "在 sources.list 中必須包含一些 'source' URI"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭"
+
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "無法分析鎖定類型 %s"
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "銷定並沒有優先順序之分（或零）"
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+msgid "Could not configure '%s'. "
+msgstr "無法開啟檔案 %s"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "提供者區塊 %s 沒有包含指紋碼"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"此安裝因衝突或預先相依關係，需暫時刪除 %s 這個基本套件。這通常不是好主意，但"
+"若您執意進行，請設定 APT::Force-LoopBreak 選項。"
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
 
-#: apt-pkg/cdrom.cc:575
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "正在卸載光碟機...\n"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "使用光碟機掛載點 %s\n"
 
-#: apt-pkg/cdrom.cc:583
-msgid "Unmounting CD-ROM\n"
-msgstr "正在卸載光碟機\n"
-
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "正在等待碟片...\n"
 
-#: apt-pkg/cdrom.cc:597
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "正在掛載光碟機... \n"
 
-#: apt-pkg/cdrom.cc:605
-msgid "Identifying.. "
-msgstr "正在識別.."
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "正在識別..."
 
-#: apt-pkg/cdrom.cc:643
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "保存標籤：%s\n"
 
-#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
-msgid "Unmounting CD-ROM...\n"
-msgstr "正在卸載光碟機...\n"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "正在掃描碟片中的索引檔...\n"
 
-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "正在掃描碟片中的索引檔..\n"
-
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯索引及 %zu 個簽章\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "找到標籤 '%s'\n"
 
-#: apt-pkg/cdrom.cc:784
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "這並不是正確的名稱，請重試。\n"
 
-#: apt-pkg/cdrom.cc:801
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3134,300 +2359,1108 @@ msgstr ""
 "這個碟片名為：\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "正在複製套件清單..."
 
-#: apt-pkg/cdrom.cc:838
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr "正在寫入新的來源列表\n"
 
-#: apt-pkg/cdrom.cc:846
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr "該碟片的來源列表項目為：\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "寫入 %i 筆紀錄。\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "套件 %s 需要重新安裝，但找不到它的套件檔。"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"錯誤，pkgProblemResolver::Resolve 的建立中斷了，這可能肇因於保留 (hold) 套"
+"件。"
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "無法修正問題，您保留 (hold) 了損毀的套件。"
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在重建相依關係"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候選版本"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "建立相依關係"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在讀取狀態資料"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n"
+msgid "Failed to open StateFile %s"
+msgstr "無法開啟 StateFile %s"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n"
+msgid "Failed to write temporary StateFile %s"
+msgstr "無法寫入暫存的 StateFile %s"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+msgid "Unable to parse package file %s (1)"
+msgstr "無法辨識套件檔 %s (1)"
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash Sum 不符"
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "無法辨識套件檔 %s (2)"
 
-#: apt-pkg/cacheset.cc:479
+#: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
 
-#: apt-pkg/cacheset.cc:482
+#: apt-pkg/cacheset.cc:492
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "找不到 '%s' 版的 '%s'"
 
-#: apt-pkg/cacheset.cc:593
+#: apt-pkg/cacheset.cc:603
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "無法找到主題 %s"
 
-#: apt-pkg/cacheset.cc:599
+#: apt-pkg/cacheset.cc:609
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "無法找到套件 %s"
 
-#: apt-pkg/cacheset.cc:605
+#: apt-pkg/cacheset.cc:615
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "無法找到套件 %s"
 
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:626
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:647
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/cacheset.cc:655
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/cacheset.cc:663
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "無法辨別 Release 檔 %s"
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有區段"
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）"
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
+
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)"
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
-msgstr ""
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）"
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用原有的索引檔。"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "正在開啟 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行"
+
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
 msgstr "正在安裝 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
 #, c-format
 msgid "Configuring %s"
 msgstr "正在設定 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
 #, c-format
 msgid "Removing %s"
 msgstr "正在移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "已完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "正在執行安裝後套件後續處理程式 %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "找不到 '%s' 目錄"
 
-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "無法開啟檔案 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:989
 #, c-format
 msgid "Preparing %s"
 msgstr "正在準備 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解開 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在準備設定 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:997
 #, c-format
 msgid "Installed %s"
 msgstr "已安裝 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在準備移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:1004
 #, c-format
 msgid "Removed %s"
 msgstr "已移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在準備完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Completely removed %s"
 msgstr "已完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1046
+#: apt-pkg/deb/dpkgpm.cc:1066
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "無法寫入 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1069
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1090
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1558
+#: apt-pkg/deb/dpkgpm.cc:1568
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1620
+#: apt-pkg/deb/dpkgpm.cc:1630
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1635
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1627
+#: apt-pkg/deb/dpkgpm.cc:1637
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1633
+#: apt-pkg/deb/dpkgpm.cc:1643
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1650
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1674
+#: apt-pkg/deb/dpkgpm.cc:1684
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "無法鎖定列表目錄"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "選項 %s 找不到"
+
+#: apt-pkg/contrib/fileutl.cc:190
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "不在唯讀檔案 %s 上使用檔案鎖定"
+
+#: apt-pkg/contrib/fileutl.cc:195
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "無法開啟鎖定檔 %s"
+
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定"
+
+#: apt-pkg/contrib/fileutl.cc:223
+#, c-format
+msgid "Could not get lock %s"
+msgstr "無法將 %s 鎖定"
+
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:394
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:412
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:421
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:824
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "子程序 %s 收到一個記憶體錯誤。"
+
+#: apt-pkg/contrib/fileutl.cc:826
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "子程序 %s 收到一個記憶體錯誤。"
+
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "子程序 %s 傳回錯誤碼 (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "子程序 %s 不預期得結束"
+
+#: apt-pkg/contrib/fileutl.cc:913
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "在關閉檔案時發生問題"
+
+#: apt-pkg/contrib/fileutl.cc:1101
+#, c-format
+msgid "Could not open file %s"
+msgstr "無法開啟檔案 %s"
+
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "無法開啟管線給 %s 使用"
+
+#: apt-pkg/contrib/fileutl.cc:1314
+msgid "Failed to create subprocess IPC"
+msgstr "無法建立子程序 IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1372
+msgid "Failed to exec compressor "
+msgstr "無法執行壓縮程式"
+
+#: apt-pkg/contrib/fileutl.cc:1513
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "讀取，仍有 %lu 未讀但已無空間"
+
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "寫入，仍有 %lu 待寫入但已沒辨法"
+
+#: apt-pkg/contrib/fileutl.cc:1913
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "在關閉檔案時發生問題"
+
+#: apt-pkg/contrib/fileutl.cc:1925
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "在同步檔案時發生問題"
+
+#: apt-pkg/contrib/fileutl.cc:1936
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "在刪除檔案時發生問題"
+
+#: apt-pkg/contrib/fileutl.cc:1949
+msgid "Problem syncing the file"
+msgstr "在同步檔案時發生問題"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... 錯誤！"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... 完成"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... 完成"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "不能 mmap 空白檔案"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "無法開啟管線給 %s 使用"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "無法 mmap 到 %lu 位元組"
+
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "無法開啟 %s"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "無法 invoke "
+
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "無法 mmap 到 %lu 位元組"
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "無法截短檔案"
+
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"動態 MMap 已用完所有空間。請增加 APT::Cache-Start 的大小。目前大小為：%lu。"
+"(man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "無法取得掛載點 %s 的狀態"
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "無法取得 CD-ROM 的狀態"
+
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "無法辨識的縮寫類型：'%c'"
+
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "開啟設定檔 %s"
+
+#: apt-pkg/contrib/configuration.cc:801
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "語法錯誤 %s:%u：區塊開頭沒有名稱。"
+
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "語法錯誤 %s:%u：標籤格式錯誤"
+
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "語法錯誤 %s:%u：數值後有多餘的垃圾"
+
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "語法錯誤 %s:%u：指令只能於最高層級執行"
+
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "語法錯誤 %s:%u: 太多巢狀引入檔"
+
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "語法錯誤 %s:%u：從此引入"
+
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "語法錯誤 %s:%u：不支援的指令 '%s'"
+
+#: apt-pkg/contrib/configuration.cc:900
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "語法錯誤 %s:%u：指令只能於最高層級執行"
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "語法錯誤 %s:%u：在檔案結尾有多餘的垃圾"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "放棄安裝。"
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "未知的命令列選項 '%c' [來自 %s]。"
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "無法理解的命令列選項 %s"
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "命令列選項 %s 不是 boolean 值"
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "需替選項 %s 指定參數。"
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "選項 %s：在指定設定項目時應該有 =<val>。"
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "選項 %s 的參數應該是數字，而不是 '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "選項 %s 太長"
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "偵測器 %s 無法理解，試試 true 或 false。"
+
+#: apt-pkg/contrib/cmndline.cc:391
+#, c-format
+msgid "Invalid operation %s"
+msgstr "無效的操作 %s"
+
+#: cmdline/apt-extracttemplates.cc:224
+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 ""
+"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
+"\n"
+"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n"
+"的工具\n"
+"\n"
+"選項\n"
+"  -h   本幫助訊息。\n"
+"  -t   指定暫存目錄\n"
+"  -c=? 讀取指定的設定檔\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "無法取得 %s 的狀態"
+
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "無法取得 debconf 版本。是否有安裝 debconf？"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr "套件延伸列表過長"
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#, c-format
+msgid "Error processing directory %s"
+msgstr "處理目錄 %s 時發生錯誤"
+
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr "原始碼的延伸列表太長"
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr "寫入標頭資訊到內容檔時發生錯誤"
+
+#: ftparchive/apt-ftparchive.cc:418
+#, c-format
+msgid "Error processing contents %s"
+msgstr "處理內容 %s 時發生錯誤"
+
+#: ftparchive/apt-ftparchive.cc:606
+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 ""
+"用法：apt-ftparchive [選項] 指令\n"
+"指令：packages 二進制檔搜索路徑 [重新定義檔 [路徑前綴]]\n"
+"      sources 原始碼搜索路徑 [重新定義檔 [路徑前綴]]\n"
+"      contents 搜索路徑\n"
+"      release 搜索路徑\n"
+"      generate 設定檔 [群組]\n"
+"      clean 設定檔\n"
+"\n"
+"apt-ftparchive 可用來替 Debian 套件庫建立索引檔。它支援了從全\n"
+"自動化到足以替代 dpkg-scanpackages 及 dpkg-scansources 所提供\n"
+"的所有功能等等各式各樣建立索引的方式。apt-ftparchive 會根據 .deb 檔案樹建立 "
+"Package 檔。Package 檔\n"
+"裡不僅包含了每個套件的 control 資料的內容，還包含了 MD5 檢驗\n"
+"碼和檔案大小。它還支援了重新定義檔，可用來強制指定優先等級及\n"
+"其所屬的類別。\n"
+"\n"
+"而同樣的，apt-ftparchive 也能根據 .dsc 檔案樹生成 Source 檔。\n"
+"可用 --source-override 選項來指定一個 src 重新定義檔。\n"
+"\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"
+"  -h    本幫助說明\n"
+"  --md5 控制如何產生 MD5 檢驗碼\n"
+"  -s=?  原始碼的重新定義檔\n"
+"  -q    安靜模式\n"
+"  -d=?  指定搭配的快取資料庫\n"
+"  --no-delink 啟用 DeLinking 模式\n"
+"  --contents  產生控制內容檔\n"
+"  -c=?  讀取指定的設定檔\n"
+"  -o=?  指定任意的設定選項"
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "找不到符合的選項"
+
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "套件檔案組 `%s' 少了部份檔案"
+
+#: ftparchive/cachedb.cc:51
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB 已損毀，檔案被更名為 %s.old"
+
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB 過舊，嘗試升級 %s"
+
+#: ftparchive/cachedb.cc:80
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。"
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "無法開啟 DB 檔 %s: %s"
+
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "套件檔沒有 control 記錄"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr "無法取得遊標"
+
+#: ftparchive/writer.cc:91
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "警告：無法讀取目錄 %s\n"
+
+#: ftparchive/writer.cc:96
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "警告：無法取得 %s 狀態\n"
+
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr "錯誤："
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr "警告："
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr "錯誤：套用到檔案時發生錯誤"
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "無法解析 %s"
+
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr "無法走訪目錄樹"
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
+msgstr "無法開啟 %s"
+
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "無法讀取連結 %s"
+
+#: ftparchive/writer.cc:290
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "無法移除連結 %s"
+
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** 無法將 %s 連結到 %s"
+
+#: ftparchive/writer.cc:308
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " 達到了 DeLink 的上限 %sB。\n"
+
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr "套件檔裡沒有套件資訊"
+
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s 沒有重新定義項目\n"
+
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s 的維護者是 %s，而非 %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s 沒有原始碼重新定義項目\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s 也沒有二元碼重新定義項目\n"
+
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - 無法配置記憶體"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "無法開啟 %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "無法讀取重新定義檔 %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "未知的壓縮演算法 '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "要壓縮輸出 %s 需搭配壓縮動作"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "無法建立 FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "fork 時失敗"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "壓縮子程序"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "內部錯誤，無法建立 %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "和子程序/檔案 IO 失敗"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "在計算 MD5 時無法讀取到資料"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "在取消 %s 的連結時發生問題"
+
+#: cmdline/apt-internal-solver.cc:46
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
+"\n"
+"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n"
+"的工具\n"
+"\n"
+"選項\n"
+"  -h   本幫助訊息。\n"
+"  -t   指定暫存目錄\n"
+"  -c=? 讀取指定的設定檔\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "未知的套件記錄！"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法：apt-sortpkgs [選項] 檔案1 [檔案2 ...]\n"
+"\n"
+"apt-sortpkgs 是用來排序套件檔的簡單工具。-s 選項是用來指定它的檔案類型。\n"
+"\n"
+"選項：\n"
+"  -h   本幫助訊息。\n"
+"  -s   根據原始檔排序\n"
+"  -c=? 讀取指定的設定檔\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s 並不是正確的 DEB 套件。"
 
diff --git a/prepare-release b/prepare-release
index 6141ce6e4..3c81a21cb 100755
--- a/prepare-release
+++ b/prepare-release
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-dpkg-checkbuilddeps -d 'libxml2-utils'
+cd "$(readlink -f $(dirname $0))"
 
 if [ -n "${GBP_BUILD_DIR}" ]; then
    cd "$GBP_BUILD_DIR"
@@ -10,7 +10,7 @@ fi
 VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p')
 DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p')
 
-LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/init.h | sed 's/\.$//')"
+LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/contrib/macros.h | sed 's/\.$//')"
 LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
 
 librarysymbolsfromfile() {
@@ -67,6 +67,8 @@ elif [ "$1" = 'post-build' ]; then
 		echo >&2 'REMEMBER: Change to a valid distribution before release'
 	fi
 
+	dpkg-checkbuilddeps -d 'libxml2-utils'
+
 	# check the manpages with each vendor for vendor-specific errors…
 	find vendor -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2 | while read DISTRO; do
 		ln -sf ../vendor/${DISTRO}/apt-vendor.ent doc
@@ -101,6 +103,8 @@ elif [ "$1" = 'buildlog' ]; then
 		librarysymbolsfromfile "$2"
 		shift
 	done
+elif [ "$1" = 'travis-ci' ]; then
+	apt-get install -q --no-install-recommends $(sed -n -e '/^Build-Depends: /,/^Build-Depends-Indep: / {p}' debian/control | sed -e 's#([^)]*)##g' -e 's#^Build-Depends\(-Indep\)\?: ##' | tr -d ',')
 else
 	echo >&1 "Usage:\t$0 pre-export
 \t$0 post-build
diff --git a/test/integration/framework b/test/integration/framework
index 99214ef73..3b900a960 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -90,18 +90,22 @@ msgdone() {
 		echo "${CDONE}DONE${CNORMAL}";
 	fi
 }
-
+getaptconfig() {
+	if [ -f ./aptconfig.conf ]; then
+            echo "./aptconfig.conf"
+	elif [ -f ../aptconfig.conf ]; then
+            echo "../aptconfig.conf"
+        fi
+}
 runapt() {
 	msgdebug "Executing: ${CCMD}$*${CDEBUG} "
 	local CMD="$1"
 	shift
-	if [ -f ./aptconfig.conf ]; then
-		MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@"
-	elif [ -f ../aptconfig.conf ]; then
-		MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@"
-	else
-		MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@"
-	fi
+	case $CMD in
+	sh|aptitude|*/*) ;;
+	*) CMD="${BUILDDIRECTORY}/$CMD";;
+	esac
+	MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH=${BUILDDIRECTORY} $CMD "$@"
 }
 aptconfig() { runapt apt-config "$@"; }
 aptcache() { runapt apt-cache "$@"; }
@@ -111,27 +115,20 @@ aptftparchive() { runapt apt-ftparchive "$@"; }
 aptkey() { runapt apt-key "$@"; }
 aptmark() { runapt apt-mark "$@"; }
 apt() { runapt apt "$@"; }
-aptwebserver() {
-  LD_LIBRARY_PATH=${APTWEBSERVERBINDIR} ${APTWEBSERVERBINDIR}/aptwebserver "$@";
-}
+apthelper() { runapt "${APTHELPERBINDIR}/apt-helper" "$@"; }
+aptwebserver() { runapt "${APTWEBSERVERBINDIR}/aptwebserver" "$@"; }
+aptitude() { runapt aptitude "$@"; }
+aptextracttemplates() { runapt apt-extracttemplates "$@"; }
+
 dpkg() {
 	command dpkg --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log "$@"
 }
-aptitude() {
-	if [ -f ./aptconfig.conf ]; then
-		APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY}  command aptitude "$@"
-	elif [ -f ../aptconfig.conf ]; then
-		APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} command aptitude "$@"
-	else
-		LD_LIBRARY_PATH=${BUILDDIRECTORY}  command aptitude "$@"
-	fi
+dpkgcheckbuilddeps() {
+	command dpkg-checkbuilddeps --admindir=${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg "$@"
 }
 gdb() {
 	echo "gdb: run »$*«"
-	APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} command gdb ${BUILDDIRECTORY}/$1 --args "$@"
-}
-http() {
-	LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/methods/http
+	APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${LIBRARYPATH} command gdb ${BUILDDIRECTORY}/$1 --args "$@"
 }
 gpg() {
 	# see apt-key for the whole trickery. Setup is done in setupenvironment
@@ -176,7 +173,9 @@ setupenvironment() {
 
         # allow overriding the default BUILDDIR location
 	BUILDDIRECTORY=${APT_INTEGRATION_TESTS_BUILD_DIR:-"${TESTDIRECTORY}/../../build/bin"}
+	LIBRARYPATH=${APT_INTEGRATION_TESTS_LIBRARY_PATH:-"${BUILDDIRECTORY}"}
         METHODSDIR=${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"}
+        APTHELPERBINDIR=${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"}
         APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"}
 	test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
         # -----
@@ -186,11 +185,18 @@ setupenvironment() {
 	mkdir rootdir aptarchive keys
 	cd rootdir
 	mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d
-	mkdir -p var/cache var/lib var/log tmp
+	mkdir -p var/cache var/lib/apt var/log tmp
 	mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers
 	touch var/lib/dpkg/available
 	mkdir -p usr/lib/apt
 	ln -s ${METHODSDIR} usr/lib/apt/methods
+        # use the autoremove from the BUILDDIRECTORY if its there, otherwise
+        # system
+        if [ -e ${BUILDDIRECTORY}/../../debian/apt.conf.autoremove ]; then
+	    ln -s ${BUILDDIRECTORY}/../../debian/apt.conf.autoremove etc/apt/apt.conf.d/01autoremove
+        else
+	    ln -s /etc/apt/apt.conf.d/01autoremove etc/apt/apt.conf.d/01autoremove
+        fi
 	cd ..
 	local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')
 	if [ -f "${TESTDIRECTORY}/${PACKAGESFILE}" ]; then
@@ -219,8 +225,6 @@ setupenvironment() {
 	echo 'quiet::NoUpdate "true";' >> aptconfig.conf
 	echo "Acquire::https::CaInfo \"${TESTDIR}/apt.pem\";" > rootdir/etc/apt/apt.conf.d/99https
         echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary
-	export LC_ALL=C.UTF-8
-	export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
 	configcompression '.' 'gz' #'bz2' 'lzma' 'xz'
 
 	# gpg needs a trustdb to function, but it can't be invalid (not even empty)
@@ -236,6 +240,12 @@ setupenvironment() {
 	# newer gpg versions are fine without it, but play it safe for now
 	gpg --quiet --check-trustdb --secret-keyring $SECRETKEYRING --keyring $SECRETKEYRING >/dev/null 2>&1
 
+	# cleanup the environment a bit
+	export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
+	export LC_ALL=C.UTF-8
+	unset LANGUAGE APT_CONFIG
+	unset GREP_OPTIONS DEB_BUILD_PROFILES
+
 	msgdone "info"
 }
 
@@ -256,6 +266,10 @@ getarchitectures() {
 	echo "$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
 }
 
+getarchitecturesfromcommalist() {
+	echo "$1" | sed -e 's#,#\n#g' | sed -e "s/^native\$/$(getarchitecture 'native')/"
+}
+
 configarchitecture() {
 	{
 		echo "APT::Architecture \"$(getarchitecture $1)\";"
@@ -429,7 +443,7 @@ Package: $NAME" >> ${BUILDDIR}/debian/control
 #		fi
 	done
 
-	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
+	for arch in $(getarchitecturesfromcommalist "$ARCH"); do
 		rm -rf ${BUILDDIR}/debian/tmp
 		mkdir -p ${BUILDDIR}/debian/tmp/DEBIAN ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME} ${BUILDDIR}/debian/tmp/usr/bin
 		cp ${BUILDDIR}/debian/copyright ${BUILDDIR}/debian/changelog ${BUILDDIR}/FEATURES ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME}
@@ -584,7 +598,7 @@ insertpackage() {
  something went horribly wrong! They are autogenerated
  und used only by testcases and surf no other propose…"}"
 	local ARCHS=""
-	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
+	for arch in $(getarchitecturesfromcommalist "$ARCH"); do
 		if [ "$arch" = 'all' -o "$arch" = 'none' ]; then
 			ARCHS="$(getarchitectures)"
 		else
@@ -646,7 +660,7 @@ insertinstalledpackage() {
 
 	local FILE='rootdir/var/lib/dpkg/status'
 	local INFO='rootdir/var/lib/dpkg/info'
-	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
+	for arch in $(getarchitecturesfromcommalist "$ARCH"); do
 		echo "Package: $NAME
 Status: $STATUS
 Priority: $PRIORITY
@@ -852,18 +866,16 @@ signreleasefiles() {
 
 webserverconfig() {
 	msgtest "Set webserver config option '${1}' to" "$2"
-	downloadfile "http://localhost:8080/_config/set/${1}/${2}" '/dev/null' >/dev/null
-	local DOWNLOG='download-testfile.log'
-	rm -f "$DOWNLOG"
-	local STATUS="${TMPWORKINGDIRECTORY}/rootdir/tmp/webserverconfig.status"
-	downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG"
-	if [ "$(cat "$STATUS")" = '200' ]; then
+	local DOWNLOG='rootdir/tmp/download-testfile.log'
+	local STATUS='rootdir/tmp/webserverconfig.status'
+	rm -f "$STATUS" "$DOWNLOG"
+	if downloadfile "http://localhost:8080/_config/set/${1}/${2}" "$STATUS" > "$DOWNLOG"; then
 		msgpass
 	else
-		cat >&2 "$DOWNLOG"
-		msgfail "Statuscode was $(cat "$STATUS")"
+		cat "$DOWNLOG" "$STATUS"
+		msgfail
 	fi
-	rm "$STATUS"
+	testwebserverlaststatuscode '200'
 }
 
 rewritesourceslist() {
@@ -873,6 +885,20 @@ rewritesourceslist() {
 	done
 }
 
+# wait for up to 10s for a pid file to appear to avoid possible race
+# when a helper is started and dosn't write the PID quick enough
+waitforpidfile() {
+        local PIDFILE="$1"
+        for i in $(seq 10); do
+                if test -s "$PIDFILE"; then
+                        return 0
+                fi
+                sleep 1
+        done
+        msgdie "waiting for $PIDFILE failed"
+        return 1
+}
+
 changetowebserver() {
 	if [ "$1" != '--no-rewrite' ]; then
 		rewritesourceslist 'http://localhost:8080/'
@@ -886,6 +912,7 @@ changetowebserver() {
 			cat $LOG
 			false
 		fi
+                waitforpidfile aptwebserver.pid
 		local PID="$(cat aptwebserver.pid)"
 		if [ -z "$PID" ]; then
 			msgdie 'Could not fork aptwebserver successfully'
@@ -913,7 +940,11 @@ accept = 4433
 connect = 8080
 " > ${TMPWORKINGDIRECTORY}/stunnel.conf
 	stunnel4 "${TMPWORKINGDIRECTORY}/stunnel.conf"
+        waitforpidfile "${TMPWORKINGDIRECTORY}/aptarchive/stunnel.pid"
 	local PID="$(cat ${TMPWORKINGDIRECTORY}/aptarchive/stunnel.pid)"
+        if [ -z "$PID" ]; then
+		msgdie 'Could not fork stunnel4 successfully'
+	fi
 	addtrap 'prefix' "kill ${PID};"
 	rewritesourceslist 'https://localhost:4433/'
 }
@@ -921,54 +952,29 @@ connect = 8080
 changetocdrom() {
 	mkdir -p rootdir/media/cdrom/.disk
 	local CD="$(readlink -f rootdir/media/cdrom)"
-	echo "acquire::cdrom::mount \"${CD}\";" > rootdir/etc/apt/apt.conf.d/00cdrom
-	echo 'acquire::cdrom::autodetect 0;' >> rootdir/etc/apt/apt.conf.d/00cdrom
+	echo "acquire::cdrom::mount \"${CD}\";
+acquire::cdrom::${CD}/::mount \"mv ${CD}-unmounted ${CD}\";
+acquire::cdrom::${CD}/::umount \"mv ${CD} ${CD}-unmounted\";
+acquire::cdrom::autodetect 0;" > rootdir/etc/apt/apt.conf.d/00cdrom
 	echo -n "$1" > ${CD}/.disk/info
 	if [ ! -d aptarchive/dists ]; then
 		msgdie 'Flat file archive cdroms can not be created currently'
 		return 1
 	fi
-	mv aptarchive/dists $CD
+	mv aptarchive/dists "$CD"
 	ln -s "$(readlink -f ./incoming)" $CD/pool
 	find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list' -delete
+	# start with an unmounted disk
+	mv "${CD}" "${CD}-unmounted"
+	# we don't want the disk to be modifiable
+	addtrap 'prefix' "chmod -f -R +w $PWD/rootdir/media/cdrom/dists/ $PWD/rootdir/media/cdrom-unmounted/dists/ || true;"
+	chmod -R -w rootdir/media/cdrom-unmounted/dists
 }
 
 downloadfile() {
-	PROTO="$(echo "$1" | cut -d':' -f 1)"
-        if [ ! -x "${METHODSDIR}/${PROTO}" ]; then
-            msgwarn "can not find ${METHODSDIR}/${PROTO}"
-            return 1
-        fi
-	local DOWNLOG="${TMPWORKINGDIRECTORY}/download.log"
-	rm -f "$DOWNLOG"
-	touch "$DOWNLOG"
-	{
-		echo "601 Configuration
-Config-Item: Acquire::https::CaInfo=${TESTDIR}/apt.pem
-Config-Item: Debug::Acquire::${PROTO}=1
-
-600 Acquire URI
-URI: $1
-Filename: ${2}
-"
-		# simple worker keeping stdin open until we are done (201) or error (400)
-		# and requesting new URIs on try-agains/redirects in-between
-		{ tail -n 999 -f "$DOWNLOG" & echo "TAILPID: $!"; } | while read f1 f2; do
-			if [ "$f1" = 'TAILPID:' ]; then
-				TAILPID="$f2"
-			elif [ "$f1" = 'New-URI:' ]; then
-				echo "600 Acquire URI
-URI: $f2
-Filename: ${2}
-"
-			elif [ "$f1" = '201' ] || [ "$f1" = '400' ]; then
-				# tail would only die on next read – which never happens
-				test -z "$TAILPID" || kill -s HUP "$TAILPID"
-				break
-			fi
-		done
-	} | LD_LIBRARY_PATH=${BUILDDIRECTORY} ${METHODSDIR}/${PROTO} 2>&1 | tee "$DOWNLOG"
-	rm "$DOWNLOG"
+	local PROTO="$(echo "$1" | cut -d':' -f 1 )"
+	apthelper -o Debug::Acquire::${PROTO}=1 \
+		download-file "$1" "$2" 2>&1 || true
 	# only if the file exists the download was successful
 	if [ -e "$2" ]; then
 		return 0
@@ -980,8 +986,8 @@ Filename: ${2}
 checkdiff() {
 	local DIFFTEXT="$(command diff -u "$@" | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')"
 	if [ -n "$DIFFTEXT" ]; then
-		echo
-		echo "$DIFFTEXT"
+		echo >&2
+		echo >&2 "$DIFFTEXT"
 		return 1
 	else
 		return 0
@@ -1030,11 +1036,17 @@ testequalor2() {
 	shift 2
 	msgtest "Test for equality OR of" "$*"
 	$* >$COMPAREAGAINST 2>&1 || true
-	(checkdiff $COMPAREFILE1 $COMPAREAGAINST 1> /dev/null ||
-		checkdiff $COMPAREFILE2 $COMPAREAGAINST 1> /dev/null) && msgpass ||
-		( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(checkdiff $COMPAREFILE1 $COMPAREAGAINST)" \
-		       "\n${CINFO}Diff against OR 2${CNORMAL}" "$(checkdiff $COMPAREFILE2 $COMPAREAGAINST)" &&
-		  msgfail )
+	if checkdiff $COMPAREFILE1 $COMPAREAGAINST >/dev/null 2>&1 || \
+		checkdiff $COMPAREFILE2 $COMPAREAGAINST >/dev/null 2>&1
+	then
+		msgpass
+	else
+		echo -n "\n${CINFO}Diff against OR 1${CNORMAL}"
+		checkdiff $COMPAREFILE1 $COMPAREAGAINST || true
+		echo -n "${CINFO}Diff against OR 2${CNORMAL}"
+		checkdiff $COMPAREFILE2 $COMPAREAGAINST || true
+		msgfail
+	fi
 }
 
 testshowvirtual() {
@@ -1060,24 +1072,24 @@ testnopackage() {
 	msgtest "Test for non-existent packages" "apt-cache show $*"
 	local SHOWPKG="$(aptcache show "$@" 2>&1 | grep '^Package: ')"
 	if [ -n "$SHOWPKG" ]; then
-		echo
-		echo "$SHOWPKG"
+		echo >&2
+		echo >&2 "$SHOWPKG"
 		msgfail
-		return 1
+	else
+		msgpass
 	fi
-	msgpass
 }
 
 testdpkginstalled() {
 	msgtest "Test for correctly installed package(s) with" "dpkg -l $*"
 	local PKGS="$(dpkg -l "$@" 2>/dev/null | grep '^i' | wc -l)"
 	if [ "$PKGS" != $# ]; then
-		echo $PKGS
-		dpkg -l "$@" | grep '^[a-z]'
+		echo >&2 $PKGS
+		dpkg -l "$@" | grep '^[a-z]' >&2
 		msgfail
-		return 1
+	else
+		msgpass
 	fi
-	msgpass
 }
 
 testdpkgnotinstalled() {
@@ -1085,11 +1097,11 @@ testdpkgnotinstalled() {
 	local PKGS="$(dpkg -l "$@" 2> /dev/null | grep '^i' | wc -l)"
 	if [ "$PKGS" != 0 ]; then
 		echo
-		dpkg -l "$@" | grep '^[a-z]'
+		dpkg -l "$@" | grep '^[a-z]' >&2
 		msgfail
-		return 1
+	else
+		msgpass
 	fi
-	msgpass
 }
 
 testmarkedauto() {
@@ -1114,8 +1126,8 @@ testsuccess() {
 	if $@ >${OUTPUT} 2>&1; then
 		msgpass
 	else
-		echo
-		cat $OUTPUT
+		echo >&2
+		cat >&2 $OUTPUT
 		msgfail
 	fi
 }
@@ -1128,14 +1140,35 @@ testfailure() {
 	fi
 	local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output"
 	if $@ >${OUTPUT} 2>&1; then
-		echo
-		cat $OUTPUT
+		echo >&2
+		cat >&2 $OUTPUT
 		msgfail
 	else
 		msgpass
 	fi
 }
 
+testwebserverlaststatuscode() {
+	local DOWNLOG='rootdir/tmp/webserverstatus-testfile.log'
+	local STATUS='rootdir/tmp/webserverstatus-statusfile.log'
+	rm -f "$DOWNLOG" "$STATUS"
+	msgtest 'Test last status code from the webserver was' "$1"
+	downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG"
+	if [ "$(cat "$STATUS")" = "$1" ]; then
+		msgpass
+	else
+		echo >&2
+		if [ -n "$2" ]; then
+			shift
+			echo >&2 '#### Additionally provided output files contain:'
+			cat >&2 "$@"
+		fi
+		echo >&2 '#### Download log of the status code:'
+		cat >&2 "$DOWNLOG"
+		msgfail "Status was $(cat "$STATUS")"
+	fi
+}
+
 pause() {
 	echo "STOPPED execution. Press enter to continue"
 	local IGNORE
diff --git a/test/integration/test-allow-scores-for-all-dependency-types b/test/integration/test-allow-scores-for-all-dependency-types
new file mode 100755
index 000000000..a5c98f3d6
--- /dev/null
+++ b/test/integration/test-allow-scores-for-all-dependency-types
@@ -0,0 +1,144 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64'
+
+insertpackage 'unversioned' 'libdb-dev' 'amd64' '5.3.0' 'Depends: libdb5.3-dev
+Conflicts: libdb5.1-dev'
+insertpackage 'unversioned' 'libdb5.1-dev' 'amd64' '5.1.29-7'
+insertpackage 'unversioned' 'libdb5.3-dev' 'amd64' '5.3.28-3' 'Conflicts: libdb5.1-dev'
+
+insertpackage 'unversioned' 'foo' 'amd64' '1'
+insertpackage 'unversioned' 'bar' 'amd64' '1'
+insertpackage 'unversioned' 'foo' 'amd64' '2' 'Conflicts: bar'
+insertpackage 'unversioned' 'bar' 'amd64' '2' 'Conflicts: foo'
+insertpackage 'unversioned' 'baz' 'amd64' '2' 'Depends: bar | foo'
+
+insertpackage 'versioned' 'libdb-dev' 'amd64' '5.3.0' 'Depends: libdb5.3-dev
+Conflicts: libdb5.1-dev (<< 5.2)'
+insertpackage 'versioned' 'libdb5.3-dev' 'amd64' '5.3.28-3' 'Conflicts: libdb5.1-dev (<< 5.2)'
+
+insertpackage 'versioned' 'foo' 'amd64' '2' 'Conflicts: bar (<= 2)'
+insertpackage 'versioned' 'bar' 'amd64' '2' 'Conflicts: foo (<= 2)'
+insertpackage 'versioned' 'baz' 'amd64' '2' 'Depends: bar (>= 2) | foo (>= 2)'
+
+insertpackage 'multipleno' 'foo' 'amd64' '2.1' 'Conflicts: bar (<= 3)'
+insertpackage 'multipleno' 'bar' 'amd64' '2.1' 'Conflicts: foo (<= 3), foo (<= 1)'
+
+insertpackage 'multipleyes' 'foo' 'amd64' '2.2' 'Conflicts: bar (<= 3)'
+# having foo multiple times as conflict is a non-advisable hack in general
+insertpackage 'multipleyes' 'bar' 'amd64' '2.2' 'Conflicts: foo (<= 3), foo (<= 3)'
+
+cp rootdir/var/lib/dpkg/status rootdir/var/lib/dpkg/status-backup
+setupaptarchive
+
+insertinstalledpackage 'libdb-dev' 'amd64' '5.1.7' 'Depends: libdb5.1-dev'
+insertinstalledpackage 'libdb5.1-dev' 'amd64' '5.1.29-7'
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be REMOVED:
+  libdb5.1-dev
+The following NEW packages will be installed:
+  libdb5.3-dev
+The following packages will be upgraded:
+  libdb-dev
+1 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
+Remv libdb5.1-dev [5.1.29-7] [libdb-dev:amd64 ]
+Inst libdb-dev [5.1.7] (5.3.0 unversioned [amd64]) []
+Inst libdb5.3-dev (5.3.28-3 unversioned [amd64])
+Conf libdb5.3-dev (5.3.28-3 unversioned [amd64])
+Conf libdb-dev (5.3.0 unversioned [amd64])' aptget dist-upgrade -st unversioned
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be REMOVED:
+  libdb5.1-dev
+The following NEW packages will be installed:
+  libdb5.3-dev
+The following packages will be upgraded:
+  libdb-dev
+1 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
+Remv libdb5.1-dev [5.1.29-7] [libdb-dev:amd64 ]
+Inst libdb-dev [5.1.7] (5.3.0 versioned [amd64]) []
+Inst libdb5.3-dev (5.3.28-3 versioned [amd64])
+Conf libdb5.3-dev (5.3.28-3 versioned [amd64])
+Conf libdb-dev (5.3.0 versioned [amd64])' aptget dist-upgrade -st versioned
+
+cp -f rootdir/var/lib/dpkg/status-backup rootdir/var/lib/dpkg/status
+insertinstalledpackage 'foo' 'amd64' '1'
+insertinstalledpackage 'bar' 'amd64' '1'
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages have been kept back:
+  bar foo
+0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -st unversioned
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages have been kept back:
+  bar foo
+0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -st versioned
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages have been kept back:
+  bar foo
+0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -st multipleno
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be REMOVED:
+  foo
+The following packages will be upgraded:
+  bar
+1 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
+Remv foo [1]
+Inst bar [1] (2.2 multipleyes [amd64])
+Conf bar (2.2 multipleyes [amd64])' aptget dist-upgrade -st multipleyes
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  baz
+0 upgraded, 1 newly installed, 0 to remove and 2 not upgraded.
+Inst baz (2 unversioned [amd64])
+Conf baz (2 unversioned [amd64])' aptget install baz -st unversioned
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  foo
+The following packages will be REMOVED:
+  bar
+The following NEW packages will be installed:
+  baz
+The following packages will be upgraded:
+  foo
+1 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
+Remv bar [1]
+Inst foo [1] (2 versioned [amd64])
+Inst baz (2 versioned [amd64])
+Conf foo (2 versioned [amd64])
+Conf baz (2 versioned [amd64])' aptget install baz -st versioned
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  baz
+0 upgraded, 1 newly installed, 0 to remove and 2 not upgraded.
+Inst baz (2 unversioned [amd64])
+Conf baz (2 unversioned [amd64])' aptget install baz -st unversioned
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  foo
+The following packages will be REMOVED:
+  bar
+The following NEW packages will be installed:
+  baz
+The following packages will be upgraded:
+  foo
+1 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
+Remv bar [1]
+Inst foo [1] (2 versioned [amd64])
+Inst baz (2 versioned [amd64])
+Conf foo (2 versioned [amd64])
+Conf baz (2 versioned [amd64])' aptget install baz -st versioned
diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index cc3483f9b..8d8fdf167 100755
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -12,31 +12,60 @@ setupaptarchive --no-update
 changetocdrom 'Debian APT Testdisk 0.8.15'
 
 # -de is not in the Release file, but picked up anyway for compatibility
-cd rootdir/media/cdrom/dists/stable/main/i18n
+cd rootdir/media/cdrom-unmounted/dists/stable/main/i18n
+chmod +w .
 sed -e '/^Description-en:/ d' -e '/^ / d' -e '/^$/ d' Translation-en > Translation-de
 echo 'Description-de: automatisch generiertes Testpaket testing=0.8.15/stable
  Diese Pakete sind nur für das testen von APT gedacht,
  sie erfüllen keinen Zweck auf einem normalen System…
 ' >> Translation-de
 compressfile Translation-de
-rm Translation-en Translation-de
+rm -f Translation-en Translation-de
+chmod -R -w .
 cd - > /dev/null
-addtrap 'prefix' "chmod -R +w $PWD/rootdir/media/cdrom/dists/;"
-chmod -R -w rootdir/media/cdrom/dists
 
-aptcdrom add -m -o quiet=1 > apt-cdrom.log 2>&1
-sed -i -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' apt-cdrom.log
-testfileequal apt-cdrom.log "Scanning disc for index files..
-Found 2 package indexes, 1 source indexes, 1 translation indexes and 1 signatures
-Found label 'Debian APT Testdisk 0.8.15'
-This disc is called: 
+aptcdromlog() {
+	rm -f rootdir/tmp/apt-cdrom.log
+	test ! -e rootdir/media/cdrom || echo "CD-ROM is mounted, but shouldn't be!"
+	test -e rootdir/media/cdrom-unmounted || echo "Unmounted CD-ROM doesn't exist, but it should!"
+	aptcdrom "$@" -o quiet=1 >rootdir/tmp/apt-cdrom.log 2>&1 </dev/null
+	sed -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' rootdir/tmp/apt-cdrom.log
+	test ! -e rootdir/media/cdrom || echo "CD-ROM is mounted, but shouldn't be!"
+	test -e rootdir/media/cdrom-unmounted || echo "Unmounted CD-ROM doesn't exist, but it should!"
+}
+
+CDROM_PRE="Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/
+Unmounting CD-ROM...
+Waiting for disc...
+Please insert a Disc in the drive and press enter 
+Mounting CD-ROM...
+Scanning disc for index files..."
+CDROM_POST="This disc is called: 
 'Debian APT Testdisk 0.8.15'
 Writing new source list
 Source list entries for this disc are:
 deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main
 deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main
+Unmounting CD-ROM...
 Repeat this process for the rest of the CDs in your set."
 
+testequal "$CDROM_PRE
+Found 2 package indexes, 1 source indexes, 1 translation indexes and 1 signatures
+Found label 'Debian APT Testdisk 0.8.15'
+$CDROM_POST" aptcdromlog add
+
+testequal "Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/
+Mounting CD-ROM...
+Stored label: Debian APT Testdisk 0.8.15
+Unmounting CD-ROM..." aptcdromlog ident
+
+# apt-setup uses these commands (expect the tr in the id) to find id and label
+ident="$(LC_ALL=C aptcdrom ident 2>&1 )"
+CD_ID="$(echo "$ident" | grep "^Identifying" | head -n1 | cut -d" " -f2 | tr --delete '[]')"
+CD_LABEL="$(echo "$ident" | grep "^Stored label:" | head -n1 | sed "s/^[^:]*: //")"
+testequal "CD::${CD_ID} \"${CD_LABEL}\";
+CD::${CD_ID}::Label \"${CD_LABEL}\";" cat rootdir/var/lib/apt/cdroms.list
+
 testequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
@@ -54,49 +83,24 @@ Inst testing:i386 (0.8.15 stable [i386])
 Conf testing:i386 (0.8.15 stable [i386])' aptget install testing:i386 -s
 
 # check Idempotence of apt-cdrom (and disabling of Translation dropping)
-aptcdrom add -m -o quiet=1 -o APT::CDROM::DropTranslation=0 > apt-cdrom.log 2>&1
-sed -i -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' apt-cdrom.log
-testfileequal apt-cdrom.log "Scanning disc for index files..
+testequal "$CDROM_PRE
 Found 2 package indexes, 1 source indexes, 2 translation indexes and 1 signatures
-This disc is called: 
-'Debian APT Testdisk 0.8.15'
-Writing new source list
-Source list entries for this disc are:
-deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main
-deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main
-Repeat this process for the rest of the CDs in your set."
+$CDROM_POST" aptcdromlog add -o APT::CDROM::DropTranslation=0
 
 # take Translations from previous runs as needed
-aptcdrom add -m -o quiet=1 > apt-cdrom.log 2>&1
-sed -i -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' apt-cdrom.log
-testfileequal apt-cdrom.log "Scanning disc for index files..
+testequal "$CDROM_PRE
 Found 2 package indexes, 1 source indexes, 2 translation indexes and 1 signatures
-This disc is called: 
-'Debian APT Testdisk 0.8.15'
-Writing new source list
-Source list entries for this disc are:
-deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main
-deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main
-Repeat this process for the rest of the CDs in your set."
+$CDROM_POST" aptcdromlog add
 msgtest 'Test for the german description translation of' 'testing'
 aptcache show testing -o Acquire::Languages=de | grep -q '^Description-de: ' && msgpass || msgfail
 rm -rf rootdir/var/lib/apt/lists
 mkdir -p rootdir/var/lib/apt/lists/partial
-aptcdrom add -m -o quiet=1 > apt-cdrom.log 2>&1
-sed -i -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' apt-cdrom.log
-testfileequal apt-cdrom.log "Scanning disc for index files..
+testequal "$CDROM_PRE
 Found 2 package indexes, 1 source indexes, 1 translation indexes and 1 signatures
-This disc is called: 
-'Debian APT Testdisk 0.8.15'
-Writing new source list
-Source list entries for this disc are:
-deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main
-deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main
-Repeat this process for the rest of the CDs in your set."
+$CDROM_POST" aptcdromlog add
 msgtest 'Test for the english description translation of' 'testing'
 aptcache show testing -o Acquire::Languages=en | grep -q '^Description-en: ' && msgpass || msgfail
 
-
 # check that we really can install from a 'cdrom'
 testdpkgnotinstalled testing
 testsuccess aptget install testing -y
diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list
index 47cfb624a..40bf81a39 100755
--- a/test/integration/test-apt-cli-list
+++ b/test/integration/test-apt-cli-list
@@ -19,12 +19,17 @@ insertinstalledpackage 'bar' 'i386' '1.0'
 insertinstalledpackage 'foobar' 'i386' '1.0'
 insertpackage 'unstable' 'foobar' 'i386' '2.0'
 
+insertinstalledpackage 'baz' 'all' '0.1'
+insertpackage 'testing' 'baz' 'all' '1.0'
+insertpackage 'unstable' 'baz' 'all' '2.0'
+
 setupaptarchive
 
 APTARCHIVE=$(readlink -f ./aptarchive)
 
 testequal "Listing...
 bar/now 1.0 i386 [installed,local]
+baz/unstable 2.0 all [upgradable from: 0.1]
 foo/unstable 1.0 all
 foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list
 
@@ -33,12 +38,14 @@ foo/unstable 1.0 all
 foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list "foo*"
 
 testequal "Listing...
+baz/unstable 2.0 all [upgradable from: 0.1]
 foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list --upgradable
 
 # FIXME: hm, hm - does it make sense to have this different? shouldn't
 #        we use "installed,upgradable" consitently?
 testequal "Listing...
 bar/now 1.0 i386 [installed,local]
+baz/now 0.1 all [installed,upgradable to: 2.0]
 foobar/now 1.0 i386 [installed,upgradable to: 2.0]" apt list --installed
 
 testequal "Listing...
@@ -51,3 +58,14 @@ bar/now 1.0 i386 [installed,local]
   an autogenerated dummy bar=1.0/installed
 " apt list bar --verbose
 
+# test for dpkg ^rc state
+insertinstalledpackage 'conf-only' 'i386' '1.0' '' '' 'deinstall ok config-files'
+testequal "Listing...
+conf-only/now 1.0 i386 [residual-config]" apt list conf-only
+
+# ensure that the users learns about multiple versions too
+testequal "Listing...
+baz/unstable 2.0 all [upgradable from: 0.1]
+N: There are 2 additional versions. Please use the '-a' switch to see them." apt list baz -o quiet=0
+
+
diff --git a/test/integration/test-apt-cli-search b/test/integration/test-apt-cli-search
index 84650b366..58613717b 100755
--- a/test/integration/test-apt-cli-search
+++ b/test/integration/test-apt-cli-search
@@ -13,7 +13,7 @@ if [ ! -x ${BUILDDIRECTORY}/apt ]; then
     exit 0
 fi
 
-DESCR='Some description that has a unusual word xxyyzz and aabbcc'
+DESCR='Some description that has a unusual word xxyyzz and aabbcc and a UPPERCASE'
 DESCR2='Some other description with the unusual aabbcc only'
 insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR"
 insertpackage 'testing' 'bar' 'i386' '2.0' '' '' "$DESCR2"
@@ -39,6 +39,11 @@ testequal "foo/unstable 1.0 all
   $DESCR
 " apt search -qq aabbcc xxyyzz
 
+# search is not case-sensitive by default
+testequal "foo/unstable 1.0 all
+  $DESCR
+" apt search -qq uppercase
+
 # output is sorted and search word finds both package
 testequal "bar/testing 2.0 i386
   $DESCR2
diff --git a/test/integration/test-apt-extracttemplates b/test/integration/test-apt-extracttemplates
new file mode 100755
index 000000000..ae2cc8bc2
--- /dev/null
+++ b/test/integration/test-apt-extracttemplates
@@ -0,0 +1,45 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64'
+
+# apt-extracttemplates needs this
+insertinstalledpackage 'debconf' 'amd64' '1.5'
+insertinstalledpackage 'pkg-with-template' 'amd64' '1.0'
+
+# build a simple package that contains a config and a tempalte
+mkdir -p DEBIAN
+TEMPLATE_STR="Template: foo/bar
+Type: string
+Description: Some bar var
+"
+echo "$TEMPLATE_STR" > DEBIAN/templates
+
+CONFIG_STR="#!/bin/sh
+random shell stuff
+"
+echo "$CONFIG_STR" > DEBIAN/config
+
+buildsimplenativepackage 'pkg-with-template' 'amd64' '0.8.15' 'stable' '' 'pkg with template' '' '' './DEBIAN' 
+
+# ensure we get the right stuff out of the file
+mkdir extracttemplates-out
+OUT="$(aptextracttemplates -t ./extracttemplates-out incoming/pkg-with-template*.deb)"
+
+PKG=$(printf "$OUT" | cut -f1 -d' ')
+INSTALLED_VER=$(printf "$OUT" | cut -f2 -d' ')
+TEMPLATE=$(printf "$OUT" | cut -f3 -d' ')
+CONFIG=$(printf "$OUT" | cut -f4 -d' ')
+
+testequal "$CONFIG_STR" cat $CONFIG
+testequal "$TEMPLATE_STR" cat $TEMPLATE
+
+# ensure that the format of the output string has the right number of dots
+for s in "$CONFIG" "$TEMPLATE"; do
+    NR_DOTS=$(basename "$s" | tr -c -d .)
+    testequal ".." echo $NR_DOTS
+done
diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
new file mode 100755
index 000000000..6505b5956
--- /dev/null
+++ b/test/integration/test-apt-helper
@@ -0,0 +1,39 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture "i386"
+
+changetohttpswebserver
+
+echo "foo" > aptarchive/foo
+
+msgtest 'apt-file download-file md5sum'
+apthelper -qq download-file http://localhost:8080/foo foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00 && msgpass || msgfail
+testfileequal foo2 'foo'
+
+msgtest 'apt-file download-file sha1'
+apthelper -qq download-file http://localhost:8080/foo foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 && msgpass || msgfail
+testfileequal foo1 'foo'
+
+msgtest 'apt-file download-file sha256'
+apthelper -qq download-file http://localhost:8080/foo foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c && msgpass || msgfail
+testfileequal foo3 'foo'
+
+msgtest 'apt-file download-file no-hash'
+apthelper -qq download-file http://localhost:8080/foo foo4 && msgpass || msgfail
+testfileequal foo4 'foo'
+
+msgtest 'apt-file download-file wrong hash'
+if ! apthelper -qq download-file http://localhost:8080/foo foo5 MD5Sum:aabbcc 2>&1 2> download.stderr; then
+   msgpass
+else
+   msgfail
+fi
+testfileequal download.stderr 'E: Failed to fetch http://localhost:8080/foo  Hash Sum mismatch
+
+E: Download Failed'
+testfileequal foo5.FAILED 'foo'
diff --git a/test/integration/test-apt-https-no-redirect b/test/integration/test-apt-https-no-redirect
index c405d1167..73352a28c 100755
--- a/test/integration/test-apt-https-no-redirect
+++ b/test/integration/test-apt-https-no-redirect
@@ -7,18 +7,24 @@ TESTDIR=$(readlink -f $(dirname $0))
 setupenvironment
 configarchitecture "i386"
 
-buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
+insertpackage 'stable' 'apt' 'all' '1'
 setupaptarchive --no-update
 
+echo 'alright' > aptarchive/working
 changetohttpswebserver  -o 'aptwebserver::redirect::replace::/redirectme/=http://localhost:8080/'
 
-msgtest 'normal http download works'
-downloadfile 'http://localhost:8080/pool/apt_1.0/changelog' changelog2 >/dev/null 2>/dev/null && msgpass || msgfail
+msgtest 'download of a file works via' 'http'
+downloadfile 'http://localhost:8080/working' httpfile >/dev/null 2>&1 && msgpass || msgfail
+testfileequal httpfile 'alright'
 
-msgtest 'normal https download works'
-downloadfile 'https://localhost:4433/pool/apt_1.0/changelog' changelog >/dev/null 2>/dev/null && msgpass || msgfail
+msgtest 'download of a file works via' 'https'
+downloadfile 'https://localhost:4433/working' httpsfile >/dev/null 2>&1 && msgpass || msgfail
+testfileequal httpsfile 'alright'
 
-msgtest 'redirecting https to http does not work'
-downloadfile 'https://localhost:4433/redirectme/pool/apt_1.0/changelog' changelog3 2>&1 | grep "Protocol http not supported or disabled in libcurl" > /dev/null && msgpass
+msgtest 'download of a file does not work if' 'https redirected to http'
+downloadfile 'https://localhost:4433/redirectme/working' redirectfile >curloutput 2>&1 && msgfail || msgpass
+
+msgtest 'libcurl has forbidden access in last request to' 'http resource'
+grep -q -- 'Protocol http not supported or disabled in libcurl' curloutput && msgpass || msgfail
 
 
diff --git a/test/integration/test-apt-progress-fd-error-postinst b/test/integration/test-apt-progress-fd-error-postinst
deleted file mode 100755
index 0b6e70212..000000000
--- a/test/integration/test-apt-progress-fd-error-postinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-set -e
-
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
-
-setupenvironment
-configarchitecture 'amd64' 'i386'
-
-mkdir -p DEBIAN/
-echo "#!/bin/sh\nexit 1" > DEBIAN/postinst
-chmod 755 DEBIAN/postinst
-
-buildsimplenativepackage 'postinst-error' 'amd64,i386' '0.8.15' 'stable' '' 'pkg with posinst error' '' '' './DEBIAN' 
-
-setupaptarchive 
-
-exec 3> apt-progress.log
-testfailure aptget install postinst-error -y -o APT::Status-Fd=3
-msgtest "Ensure correct error message for postinst error"
-grep -q "pmerror:postinst-error :80:subprocess installed post-installation script returned error exit status 2" apt-progress.log && msgpass || msgfail
-
diff --git a/test/integration/test-bug-612958-use-dpkg-multiarch-config b/test/integration/test-bug-612958-use-dpkg-multiarch-config
index 4d1f00ca0..7bf5781e8 100755
--- a/test/integration/test-bug-612958-use-dpkg-multiarch-config
+++ b/test/integration/test-bug-612958-use-dpkg-multiarch-config
@@ -43,6 +43,15 @@ testpass 'apt config' 'armel'
 rm $CONFFILE
 
 echo '#clear APT::Architectures;' >> $CONFFILE
+echo 'APT::Architectures "i386,amd64";' >> $CONFFILE
+
+testpass 'apt config' 'i386'
+testpass 'apt config' 'amd64'
+testfail 'apt config' 'armel'
+
+rm $CONFFILE
+
+echo '#clear APT::Architectures;' >> $CONFFILE
 echo 'Dir::Bin::dpkg "./dpkg-printer";' >> $CONFFILE
 
 echo '#! /bin/sh
diff --git a/test/integration/test-bug-661537-build-profiles-support b/test/integration/test-bug-661537-build-profiles-support
new file mode 100755
index 000000000..ae1403f71
--- /dev/null
+++ b/test/integration/test-bug-661537-build-profiles-support
@@ -0,0 +1,147 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'i386' 'armel'
+
+insertinstalledpackage 'build-essential' 'all' '0' 'Multi-Arch: foreign'
+
+insertpackage 'unstable' 'foo' 'all' '1.0'
+insertpackage 'unstable' 'bar' 'all' '1.0'
+
+insertsource 'unstable' 'buildprofiles' 'any' '1' 'Build-Depends: foo (>= 1.0) [i386 arm] <!profile.stage1 !profile.cross>, bar'
+
+# table from https://wiki.debian.org/BuildProfileSpec
+insertsource 'unstable' 'spec-1' 'any' '1' 'Build-Depends: foo <!profile.stage1>'
+insertsource 'unstable' 'spec-2' 'any' '1' 'Build-Depends: foo <profile.stage1>'
+insertsource 'unstable' 'spec-3' 'any' '1' 'Build-Depends: foo <!profile.stage1 !profile.notest>'
+insertsource 'unstable' 'spec-4' 'any' '1' 'Build-Depends: foo <profile.stage1 profile.notest>'
+insertsource 'unstable' 'spec-5' 'any' '1' 'Build-Depends: foo <!profile.stage1 profile.notest>'
+insertsource 'unstable' 'spec-6' 'any' '1' 'Build-Depends: foo <profile.stage1 !profile.notest>'
+# multiple stanzas not supported: error out
+insertsource 'unstable' 'spec-7' 'any' '1' 'Build-Depends: foo <profile.stage1><!profile.notest>'
+insertsource 'unstable' 'spec-8' 'any' '1' 'Build-Depends: foo <profile.stage1> <!profile.notest>'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  bar
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst bar (1.0 unstable [all])
+Conf bar (1.0 unstable [all])' aptget build-dep buildprofiles -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  bar foo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar (1.0 unstable [all])
+Inst foo (1.0 unstable [all])
+Conf bar (1.0 unstable [all])
+Conf foo (1.0 unstable [all])' aptget build-dep buildprofiles -s -o APT::Architecture=i386
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  bar
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst bar (1.0 unstable [all])
+Conf bar (1.0 unstable [all])' aptget build-dep buildprofiles -s -o APT::Architecture=armel
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  bar
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst bar (1.0 unstable [all])
+Conf bar (1.0 unstable [all])' aptget build-dep buildprofiles -s -o APT::Architecture=i386 -P stage1
+
+KEEP='Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  foo
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1.0 unstable [all])
+Conf foo (1.0 unstable [all])'
+DROP='Reading package lists...
+Building dependency tree...
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.'
+
+msgtest 'Check if version of installed dpkg is high enough for' 'build profiles support'
+if dpkg --compare-versions "$(command dpkg-query --showformat='${Version}' --show dpkg)" 'ge' '1.17.2'; then
+	msgpass
+	testwithdpkg() {
+		msgtest "Test with" "dpkg-checkbuilddeps -d '$1' -P '$2'"
+		local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testwithdpkg.output"
+		if dpkgcheckbuilddeps -d "$1" -P "$2" /dev/null >$OUTPUT 2>&1; then
+			if [ "$3" = "$DROP" ]; then
+				msgpass
+			else
+				cat $OUTPUT
+				msgfail
+			fi
+		else
+			if [ "$3" = "$KEEP" ]; then
+				msgpass
+			else
+				cat $OUTPUT
+				msgfail
+			fi
+		fi
+	}
+else
+	msgskip
+	testwithdpkg() {
+		msgtest "Test with" "dpkg-checkbuilddeps -d '$1' -P '$2'"
+		msgskip
+	}
+fi
+
+testprofile() {
+	if [ -n "$3" ]; then
+		testequal "$4" aptget build-dep "$1" -s -P "$3"
+		export DEB_BUILD_PROFILES="$(echo "$3" | tr ',' ' ')"
+		testequal "$4" aptget build-dep "$1" -s -o with::environment=1
+		unset DEB_BUILD_PROFILES
+	else
+		testequal "$4" aptget build-dep "$1" -s
+	fi
+	testwithdpkg "$2" "$3" "$4"
+}
+
+testprofile 'spec-1' 'foo <!profile.stage1>' '' "$KEEP"
+testprofile 'spec-1' 'foo <!profile.stage1>' 'stage1' "$DROP"
+testprofile 'spec-1' 'foo <!profile.stage1>' 'notest' "$KEEP"
+testprofile 'spec-1' 'foo <!profile.stage1>' 'stage1,notest' "$DROP"
+
+testprofile 'spec-2' 'foo <profile.stage1>' '' "$DROP"
+testprofile 'spec-2' 'foo <profile.stage1>' 'stage1' "$KEEP"
+testprofile 'spec-2' 'foo <profile.stage1>' 'notest' "$DROP"
+testprofile 'spec-2' 'foo <profile.stage1>' 'stage1,notest' "$KEEP"
+
+testprofile 'spec-3' 'foo <!profile.stage1 !profile.notest>' '' "$KEEP"
+testprofile 'spec-3' 'foo <!profile.stage1 !profile.notest>' 'stage1' "$DROP"
+testprofile 'spec-3' 'foo <!profile.stage1 !profile.notest>' 'notest' "$DROP"
+testprofile 'spec-3' 'foo <!profile.stage1 !profile.notest>' 'stage1,notest' "$DROP"
+
+testprofile 'spec-4' 'foo <profile.stage1 profile.notest>' '' "$DROP"
+testprofile 'spec-4' 'foo <profile.stage1 profile.notest>' 'stage1' "$KEEP"
+testprofile 'spec-4' 'foo <profile.stage1 profile.notest>' 'notest' "$KEEP"
+testprofile 'spec-4' 'foo <profile.stage1 profile.notest>' 'stage1,notest' "$KEEP"
+
+testprofile 'spec-5' 'foo <!profile.stage1 profile.notest>' '' "$KEEP"
+testprofile 'spec-5' 'foo <!profile.stage1 profile.notest>' 'stage1' "$DROP"
+testprofile 'spec-5' 'foo <!profile.stage1 profile.notest>' 'notest' "$KEEP"
+testprofile 'spec-5' 'foo <!profile.stage1 profile.notest>' 'stage1,notest' "$DROP"
+
+testprofile 'spec-6' 'foo <profile.stage1 !profile.notest>' '' "$KEEP"
+testprofile 'spec-6' 'foo <profile.stage1 !profile.notest>' 'stage1' "$KEEP"
+testprofile 'spec-6' 'foo <profile.stage1 !profile.notest>' 'notest' "$DROP"
+testprofile 'spec-6' 'foo <profile.stage1 !profile.notest>' 'stage1,notest' "$KEEP"
+
+testfailure aptget build-dep spec-7 -s
+testfailure aptget build-dep spec-8 -s
diff --git a/test/integration/test-bug-735967-lib32-to-i386-unavailable b/test/integration/test-bug-735967-lib32-to-i386-unavailable
index 4dbe1d25d..e9f3bf96d 100755
--- a/test/integration/test-bug-735967-lib32-to-i386-unavailable
+++ b/test/integration/test-bug-735967-lib32-to-i386-unavailable
@@ -12,6 +12,9 @@ insertpackage 'unstable' 'libnss-mdns' 'amd64,i386' '0.10-6' 'Multi-Arch: same
 Breaks: lib32nss-mdns (<< 0.10-6)'
 insertpackage 'unstable' 'libnss-mdns-i386' 'i386' '0.10-6' 'Multi-Arch: foreign
 Depends: libnss-mdns'
+# introduce some dummies so that there are versions, but none works
+insertpackage 'unstable' 'libnss-mdns-i386' 'amd64' '0.1-6'
+insertpackage 'experimental' 'libnss-mdns-amd64' 'i386,amd64' '0.10-6' 'Provides: libnss-mdns-i386'
 
 insertpackage 'unstable' 'foo' 'amd64' '1' 'Depends: libfoo'
 insertpackage 'unstable' 'libfoo' 'amd64' '1' 'Depends: libfoo-bin'
diff --git a/test/integration/test-bug-740843-versioned-up-down-breaks b/test/integration/test-bug-740843-versioned-up-down-breaks
new file mode 100755
index 000000000..cb035a71f
--- /dev/null
+++ b/test/integration/test-bug-740843-versioned-up-down-breaks
@@ -0,0 +1,55 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'i386'
+
+insertinstalledpackage 'foo-driver' 'amd64' '1' 'Depends: libfoo (= 1)
+Recommends: libgl1-foo-glx (= 1)
+Breaks: libgl1-foo-glx (<< 1), libgl1-foo-glx (>> 1)'
+insertinstalledpackage 'libgl1-foo-glx' 'amd64,i386' '1' 'Depends: libfoo (= 1)
+Multi-Arch: same'
+insertinstalledpackage 'libfoo' 'amd64,i386' '1' 'Multi-Arch: same'
+
+buildsimplenativepackage 'foo-driver' 'amd64' '2' 'stable' 'Depends: libfoo (= 2)
+Recommends: libgl1-foo-glx (= 2)
+Breaks: libgl1-foo-glx (<< 2), libgl1-foo-glx (>> 2)'
+buildsimplenativepackage 'libgl1-foo-glx' 'amd64,i386' '2' 'stable' 'Depends: libfoo (= 2)
+Multi-Arch: same'
+buildsimplenativepackage 'libfoo' 'amd64,i386' '2' 'stable' 'Multi-Arch: same'
+
+setupaptarchive
+
+testequalor2 'Reading package lists...
+Building dependency tree...
+The following packages will be upgraded:
+  foo-driver libfoo libfoo:i386 libgl1-foo-glx libgl1-foo-glx:i386
+5 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Inst libgl1-foo-glx [1] (2 stable [amd64]) [libgl1-foo-glx:amd64 on libgl1-foo-glx:i386] [libgl1-foo-glx:i386 on libgl1-foo-glx:amd64] [foo-driver:amd64 on libgl1-foo-glx:amd64] [libgl1-foo-glx:i386 foo-driver:amd64 ]
+Inst libgl1-foo-glx:i386 [1] (2 stable [i386]) [foo-driver:amd64 on libgl1-foo-glx:amd64] [foo-driver:amd64 on libgl1-foo-glx:i386] [foo-driver:amd64 ]
+Inst foo-driver [1] (2 stable [amd64]) []
+Inst libfoo:i386 [1] (2 stable [i386]) [libfoo:amd64 on libfoo:i386] [libfoo:i386 on libfoo:amd64] [libfoo:amd64 ]
+Inst libfoo [1] (2 stable [amd64])
+Conf libfoo:i386 (2 stable [i386])
+Conf libfoo (2 stable [amd64])
+Conf libgl1-foo-glx:i386 (2 stable [i386])
+Conf libgl1-foo-glx (2 stable [amd64])
+Conf foo-driver (2 stable [amd64])' 'Reading package lists...
+Building dependency tree...
+The following packages will be upgraded:
+  foo-driver libfoo libfoo:i386 libgl1-foo-glx libgl1-foo-glx:i386
+5 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Inst libgl1-foo-glx [1] (2 stable [amd64]) [foo-driver:amd64 on libgl1-foo-glx:amd64] [libgl1-foo-glx:amd64 on libgl1-foo-glx:i386] [libgl1-foo-glx:i386 on libgl1-foo-glx:amd64] [foo-driver:amd64 libgl1-foo-glx:i386 ]
+Inst libgl1-foo-glx:i386 [1] (2 stable [i386]) [foo-driver:amd64 on libgl1-foo-glx:amd64] [foo-driver:amd64 on libgl1-foo-glx:i386] [foo-driver:amd64 ]
+Inst foo-driver [1] (2 stable [amd64]) []
+Inst libfoo:i386 [1] (2 stable [i386]) [libfoo:amd64 on libfoo:i386] [libfoo:i386 on libfoo:amd64] [libfoo:amd64 ]
+Inst libfoo [1] (2 stable [amd64])
+Conf libfoo:i386 (2 stable [i386])
+Conf libfoo (2 stable [amd64])
+Conf libgl1-foo-glx:i386 (2 stable [i386])
+Conf libgl1-foo-glx (2 stable [amd64])
+Conf foo-driver (2 stable [amd64])' aptget dist-upgrade -s
+
+testsuccess aptget dist-upgrade -y -o Debug::pkgPackageManager=1 -o Debug::pkgOrderList=1
diff --git a/test/integration/test-bug-multiarch-upgrade b/test/integration/test-bug-multiarch-upgrade
index dc3725df1..c29e1f903 100755
--- a/test/integration/test-bug-multiarch-upgrade
+++ b/test/integration/test-bug-multiarch-upgrade
@@ -25,5 +25,5 @@ The following packages will be upgraded:
 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Inst libcups2 [1] (2 unstable [amd64]) [libcups2:amd64 on libcups2:i386] [libcups2:i386 on libcups2:amd64] [libcups2:i386 ]
 Inst libcups2:i386 [1] (2 unstable [i386])
-Conf libcups2 (2 unstable [amd64])
-Conf libcups2:i386 (2 unstable [i386])' aptget install -s libcups2:i386
+Conf libcups2:i386 (2 unstable [i386])
+Conf libcups2 (2 unstable [amd64])' aptget install -s libcups2:i386
diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes
index c6f5ab49e..67ca0ba27 100755
--- a/test/integration/test-compressed-indexes
+++ b/test/integration/test-compressed-indexes
@@ -5,6 +5,7 @@ TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 
 setupenvironment
+configcompression '.' 'gz' # only gz is supported for this, so ensure it is used
 configarchitecture "i386"
 
 buildsimplenativepackage "testpkg" "i386" "1.0"
diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop
index 4407fbd9d..4978fe1e8 100755
--- a/test/integration/test-conflicts-loop
+++ b/test/integration/test-conflicts-loop
@@ -6,11 +6,11 @@ TESTDIR=$(readlink -f $(dirname $0))
 setupenvironment
 configarchitecture "i386"
 
-insertinstalledpackage 'openjdk-6-jre' 'i386' '6b16-1.8-0ubuntu1' 
+insertinstalledpackage 'openjdk-6-jre' 'i386' '6b16-1.8-0ubuntu1'
 insertpackage 'unstable' 'openjdk-6-jre' 'i386' '6b20-1.9.8-0ubuntu1~10.04.1' 'Conflicts: openjdk-6-jre-headless (<< 6b17~pre3-1), openjdk-6-jre-lib (<< 6b17~pre3-1)'
-insertinstalledpackage 'openjdk-6-jre-lib' 'i386' '6b16-1.8-0ubuntu1' 
+insertinstalledpackage 'openjdk-6-jre-lib' 'i386' '6b16-1.8-0ubuntu1'
 insertpackage 'unstable' 'openjdk-6-jre-lib' 'i386' '6b20-1.9.8-0ubuntu1~10.04.1' 'Conflicts:  openjdk-6-jre (<< 6b17~pre3-1), openjdk-6-jre-headless (<< 6b17~pre3-1)'
-insertinstalledpackage 'openjdk-6-jre-headless' 'i386' '6b16-1.8-0ubuntu1' 
+insertinstalledpackage 'openjdk-6-jre-headless' 'i386' '6b16-1.8-0ubuntu1'
 insertpackage 'unstable' 'openjdk-6-jre-headless' 'i386' '6b20-1.9.8-0ubuntu1~10.04.1' 'Conflicts:  openjdk-6-jre (<< 6b17~pre3-1), openjdk-6-jre-lib (<< 6b17~pre3-1)'
 
 setupaptarchive
@@ -19,16 +19,10 @@ testequal 'Reading package lists...
 Building dependency tree...
 The following packages will be upgraded:
   openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib
-  openjdk-6-jre-lib:i386 conflicts with openjdk-6-jre:i386
-    openjdk-6-jre:i386 conflicts with openjdk-6-jre-headless:i386
-      openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre:i386
 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Remv openjdk-6-jre [6b16-1.8-0ubuntu1]
-      openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre-lib:i386
 Remv openjdk-6-jre-lib [6b16-1.8-0ubuntu1]
 Inst openjdk-6-jre-headless [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
-    openjdk-6-jre:i386 conflicts with openjdk-6-jre-lib:i386
-    openjdk-6-jre:i386 conflicts with openjdk-6-jre-lib:i386
 Inst openjdk-6-jre [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
 Inst openjdk-6-jre-lib [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
 Conf openjdk-6-jre-lib (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
diff --git a/test/integration/test-failing-maintainer-scripts b/test/integration/test-failing-maintainer-scripts
new file mode 100755
index 000000000..3dd7d643e
--- /dev/null
+++ b/test/integration/test-failing-maintainer-scripts
@@ -0,0 +1,132 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'native'
+
+# create a bunch of failures
+createfailure() {
+	setupsimplenativepackage "failure-$1" 'native' '1.0' 'unstable' 'Depends: dependee'
+	BUILDDIR="incoming/failure-$1-1.0"
+	echo '#!/bin/sh
+exit 29' > ${BUILDDIR}/debian/$1
+	buildpackage "$BUILDDIR" 'unstable' 'main' 'native'
+	rm -rf "$BUILDDIR"
+}
+
+buildsimplenativepackage 'dependee' 'native' '1.0' 'unstable'
+createfailure 'preinst'
+createfailure 'postinst'
+createfailure 'prerm'
+createfailure 'postrm'
+
+setupaptarchive
+
+# create a library to noop chroot() and rewrite maintainer script executions
+# via execvp() as used by dpkg as we don't want our rootdir to be a fullblown
+# chroot directory dpkg could chroot into to execute the maintainer scripts
+cat << EOF > noopchroot.c
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dlfcn.h>
+
+static char * chrootdir = NULL;
+
+int chroot(const char *path) {
+	printf("WARNING: CHROOTing to %s was ignored!\n", path);
+	free(chrootdir);
+	chrootdir = strdup(path);
+	return 0;
+}
+int execvp(const char *file, char *const argv[]) {
+	static int (*func_execvp) (const char *, char * const []) = NULL;
+	if (func_execvp == NULL)
+		func_execvp = (int (*) (const char *, char * const [])) dlsym(RTLD_NEXT, "execvp");
+	if (chrootdir == NULL || strncmp(file, "/var/lib/dpkg/", strlen("/var/lib/dpkg/")) != 0)
+		return func_execvp(file, argv);
+	printf("REWRITE execvp call %s into %s\n", file, chrootdir);
+	char newfile[strlen(chrootdir) + strlen(file)];
+	strcpy(newfile, chrootdir);
+	strcat(newfile, file);
+	return func_execvp(newfile, argv);
+}
+EOF
+testsuccess gcc -fPIC -shared -o noopchroot.so noopchroot.c -ldl
+
+mkdir -p "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/"
+DPKG="${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg"
+echo "#!/bin/sh
+if [ -n \"\$LD_PRELOAD\" ]; then
+	export LD_PRELOAD=\"${TMPWORKINGDIRECTORY}/noopchroot.so \${LD_PRELOAD}\"
+else
+	export LD_PRELOAD=\"${TMPWORKINGDIRECTORY}/noopchroot.so\"
+fi
+dpkg \"\$@\"" > $DPKG
+chmod +x $DPKG
+sed -ie "s|^DPKG::options:: \"dpkg\";\$|DPKG::options:: \"$DPKG\";|" aptconfig.conf
+
+# setup some pre- and post- invokes to check the output isn't garbled later
+APTHOOK="${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apthook"
+echo '#!/bin/sh
+echo "$1: START"
+echo "$1: MaiN"
+echo "$1: ENd"' > $APTHOOK
+chmod +x $APTHOOK
+echo "DPKG::Pre-Invoke:: \"${APTHOOK} PRE\";
+DPKG::Post-Invoke:: \"${APTHOOK} POST\";" > rootdir/etc/apt/apt.conf.d/99apthooks
+
+testmyfailure() {
+	local PROGRESS='rootdir/tmp/progress.log'
+	exec 3> $PROGRESS
+	testfailure "$@" -o APT::Status-Fd=3
+	msgtest 'Test for failure message of maintainerscript in' 'console log'
+	local TEST='rootdir/tmp/testfailure.output'
+	if grep -q 'exit status 29' "$TEST"; then
+		msgpass
+	else
+		cat $TEST
+		msgfail
+	fi
+	msgtest 'Test for proper execution of invoke scripts in' 'console log'
+	if grep -q '^PRE: START$' $TEST &&
+		grep -q '^PRE: MaiN$' $TEST &&
+		grep -q '^PRE: ENd$' $TEST &&
+		grep -q '^POST: START$' $TEST &&
+		grep -q '^POST: MaiN$' $TEST &&
+		grep -q '^POST: ENd$' $TEST; then
+		msgpass
+	else
+		cat $TEST
+		msgfail
+	fi
+	msgtest 'Test for failure message of maintainerscript in' 'progress log'
+	if grep -q '^pmerror:.\+exit status 29$' "$PROGRESS"; then
+		msgpass
+	else
+		cat $PROGRESS
+		msgfail
+	fi
+	testmarkedauto 'dependee'
+}
+
+cp -a rootdir/var/lib/dpkg/status rootdir/var/lib/dpkg/status.backup
+testmyfailure aptget install failure-preinst -y
+cp -a rootdir/var/lib/dpkg/status.backup rootdir/var/lib/dpkg/status
+testmyfailure aptget install failure-postinst -y
+cp -a rootdir/var/lib/dpkg/status.backup rootdir/var/lib/dpkg/status
+testsuccess aptget install failure-prerm -y
+testdpkginstalled failure-prerm
+testmyfailure aptget purge failure-prerm -y
+cp -a rootdir/var/lib/dpkg/status.backup rootdir/var/lib/dpkg/status
+testsuccess aptget install failure-postrm -y
+testdpkginstalled failure-postrm
+testmyfailure aptget purge failure-postrm -y
+
+# FIXME: test with output going to a PTY as it usually does
+#cp -a rootdir/var/lib/dpkg/status.backup rootdir/var/lib/dpkg/status
+#aptget install failure-preinst -y
diff --git a/test/integration/test-ignore-provides-if-versioned-breaks b/test/integration/test-ignore-provides-if-versioned-breaks
index f8b4544a0..745f7d206 100755
--- a/test/integration/test-ignore-provides-if-versioned-breaks
+++ b/test/integration/test-ignore-provides-if-versioned-breaks
@@ -142,9 +142,9 @@ The following packages will be upgraded:
 2 upgraded, 2 newly installed, 0 to remove and 2 not upgraded.
 Inst foo-same:amd64 [2.0] (4.0 unstable [amd64]) [foo-same:amd64 on foo-same:i386] [foo-same:i386 on foo-same:amd64] [foo-same:i386 ]
 Inst foo-same [2.0] (4.0 unstable [i386])
-Conf foo-same:amd64 (4.0 unstable [amd64])
-Conf foo-same (4.0 unstable [i386])
 Inst foo-same-breaker-3 (1.0 unstable [i386])
 Inst foo-same-provider (1.0 unstable [i386])
+Conf foo-same (4.0 unstable [i386])
+Conf foo-same:amd64 (4.0 unstable [amd64])
 Conf foo-same-breaker-3 (1.0 unstable [i386])
 Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-3 -s
diff --git a/test/integration/test-ignore-provides-if-versioned-conflicts b/test/integration/test-ignore-provides-if-versioned-conflicts
index 44eafcff1..a07252768 100755
--- a/test/integration/test-ignore-provides-if-versioned-conflicts
+++ b/test/integration/test-ignore-provides-if-versioned-conflicts
@@ -142,9 +142,9 @@ The following packages will be upgraded:
 2 upgraded, 2 newly installed, 0 to remove and 2 not upgraded.
 Inst foo-same:amd64 [2.0] (4.0 unstable [amd64]) [foo-same:amd64 on foo-same:i386] [foo-same:i386 on foo-same:amd64] [foo-same:i386 ]
 Inst foo-same [2.0] (4.0 unstable [i386])
-Conf foo-same:amd64 (4.0 unstable [amd64])
-Conf foo-same (4.0 unstable [i386])
 Inst foo-same-breaker-3 (1.0 unstable [i386])
 Inst foo-same-provider (1.0 unstable [i386])
+Conf foo-same (4.0 unstable [i386])
+Conf foo-same:amd64 (4.0 unstable [amd64])
 Conf foo-same-breaker-3 (1.0 unstable [i386])
 Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-3 -s
diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove
index 2b165d100..c51caa758 100755
--- a/test/integration/test-kernel-helper-autoremove
+++ b/test/integration/test-kernel-helper-autoremove
@@ -1,55 +1,101 @@
 #!/bin/sh
-
 set -e
 
-# setup testdir
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64'
+
+# the executed script would use the installed apt-config,
+# which is outside of our control
+msgtest 'Check that the installed apt-config supports' '--no-empty'
+if apt-config dump --no-empty >/dev/null 2>&1; then
+	msgpass
+else
+	msgskip
+	exit 0
+fi
+
+CURRENTKERNEL="linux-image-$(uname -r)"
+insertinstalledpackage "$CURRENTKERNEL" 'amd64' '1'
+insertinstalledpackage 'linux-image-1.0.0-2-generic' 'amd64' '1.0.0-2'
+insertinstalledpackage 'linux-image-100.0.0-1-generic' 'amd64' '100.0.0-1'
+insertinstalledpackage 'linux-image-amd64' 'amd64' '100.0.0-1'
+# ensure that the '.' is really a dot and not a wildcard
+insertinstalledpackage 'linux-headers-1000000-1-generic' 'amd64' '100.0.0-1'
 
-TMPDIR=$(mktemp -d)
-cd $TMPDIR
-addtrap "cd /; rm -rf $TMPDIR"
+testsuccess aptmark auto "$CURRENTKERNEL" 'linux-image-1.0.0-2-generic' 'linux-image-100.0.0-1-generic' 'linux-headers-1000000-1-generic'
 
-# create mock environment
-mkdir apt.conf.d
-cat > aptconfig.conf <<EOF
-Dir::Etc::parts "$TMPDIR/apt.conf.d";
-Dir::bin::dpkg "$TMPDIR/fake-dpkg";
+cat > ./fake-dpkg <<EOF
+#!/bin/sh
+exec $(aptconfig dump --no-empty --format='%v ' 'DPKG::options') "\$@"
 EOF
-APT_CONFIG=aptconfig.conf
-export APT_CONFIG
+chmod +x ./fake-dpkg
+echo 'Dir::Bin::dpkg "./fake-dpkg";' > rootdir/etc/apt/apt.conf.d/99fakedpkg
 
 # install fake-dpkg into it
-install -m755 $TESTDIR/test-kernel-helper-autoremove.fake-dpkg $TMPDIR/fake-dpkg
+catfail() {
+	echo >&2
+	echo >&2 '### List of protected kernels:'
+	cat >&2 protected.list
+	msgfail
+}
 
-# run the helper
-sh ${TESTDIR}/../../debian/apt.auto-removal.sh
+testprotected() {
+	rm -f rootdir/etc/apt/apt.conf.d/01autoremove-kernels protected.list
 
-msgtest 'Check that kernel autoremoval list is correctly created'
-# and ensure its there, valid and version 10.0.0-1 is there too
-test -e $TMPDIR/apt.conf.d/01autoremove-kernels && msgpass || msgfail
+	testsuccess runapt sh ${TESTDIR}/../../debian/apt.auto-removal.sh "$@"
 
-msgtest 'Check that most recent kernel is saved from autoremoval'
-apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic" && msgpass || msgfail
+	msgtest 'Check kernel autoremoval protection list' 'is created'
+	test -e rootdir/etc/apt/apt.conf.d/01autoremove-kernels && msgpass || msgfail
 
-# ... and also that the running kernel is excluded
-msgtest 'Check that running kernel is saved from autoremoval'
-apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)" && msgpass || msgfail
+	msgtest 'Check kernel autoremoval protection list' 'can be dumped'
+	aptconfig dump --no-empty --format '%v%n' 'APT::NeverAutoRemove' >protected.list 2>&1 && msgpass || catfail
 
-# and that the old kernel is *not* excluded from autoremoval
-msgtest 'Check that older kernels are not excluded from autoremoval'
-apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.01-2-generic" && msgfail || msgpass
+	msgtest 'Check kernel autoremoval protection list' 'can be parsed'
+	grep -q '^[A-Z]: ' protected.list && catfail || msgpass
 
-msgtest "Check that the older kernel is retained when it's being installed"
-sh ${TESTDIR}/../../debian/apt.auto-removal.sh 1.0.01-2-generic
-test -e $TMPDIR/apt.conf.d/01autoremove-kernels
-if ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic" \
-   || ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)" \
-   || ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.01-2-generic"
-then
-	msgfail
-else
-	msgpass
-fi
+	msgtest 'Check kernel autoremoval protection list includes' 'most recent kernel'
+	grep -q '^\^linux-image-100\\\.0\\\.0-1-generic\$$' protected.list && msgpass || catfail
+
+	msgtest 'Check kernel autoremoval protection list includes' 'running kernel'
+	grep -q "^\\^linux-image-$(uname -r | sed -e 's#\.#\\\\.#g')\\\$\$" protected.list && msgpass || catfail
+}
+
+testequal "Reading package lists...
+Building dependency tree...
+Reading state information...
+The following packages will be REMOVED:
+   linux-headers-1000000-1-generic (100.0.0-1)
+   linux-image-1.0.0-2-generic (1.0.0-2)
+   linux-image-100.0.0-1-generic (100.0.0-1)
+   $CURRENTKERNEL (1)
+0 upgraded, 0 newly installed, 4 to remove and 0 not upgraded.
+Remv linux-headers-1000000-1-generic [100.0.0-1]
+Remv linux-image-1.0.0-2-generic [1.0.0-2]
+Remv linux-image-100.0.0-1-generic [100.0.0-1]
+Remv $CURRENTKERNEL [1]" aptget autoremove -sV
+
+testprotected
+msgtest 'Check kernel autoremoval protection list does not include' 'old kernel'
+grep -q '^\^linux-image-1\\\.0\\\.0-2-generic\$$' protected.list && catfail || msgpass
+
+testequal 'Reading package lists...
+Building dependency tree...
+Reading state information...
+The following packages will be REMOVED:
+  linux-headers-1000000-1-generic linux-image-1.0.0-2-generic
+0 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
+Remv linux-headers-1000000-1-generic [100.0.0-1]
+Remv linux-image-1.0.0-2-generic [1.0.0-2]' aptget autoremove -s
 
-# done
+testprotected 1.0.0-2-generic
+msgtest 'Check kernel autoremoval protection list includes' 'installed kernel'
+grep -q '^\^linux-image-1\\\.0\\\.0-2-generic\$$' protected.list && msgpass || catfail
+testequal 'Reading package lists...
+Building dependency tree...
+Reading state information...
+The following packages will be REMOVED:
+  linux-headers-1000000-1-generic
+0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
+Remv linux-headers-1000000-1-generic [100.0.0-1]' aptget autoremove -s
diff --git a/test/integration/test-kernel-helper-autoremove.fake-dpkg b/test/integration/test-kernel-helper-autoremove.fake-dpkg
deleted file mode 100644
index a365c5370..000000000
--- a/test/integration/test-kernel-helper-autoremove.fake-dpkg
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = "-l" ]; then
-    echo "ii  linux-image-1.0.0-2-generic  1.0.01-2  amd64"
-    echo "ii  linux-image-$(uname -r)  not-used  amd64"
-    echo "ii linux-image-10.0.0-1-generic  10.0.0.1-1  amd64"
-elif [ "$1" = "--compare-versions" ]; then
-    dpkg "$1" "$2" "$3" "$4"
-else
-    dpkg $@
-fi
-
diff --git a/test/integration/test-partial-file-support b/test/integration/test-partial-file-support
index 382789e68..5ab326def 100755
--- a/test/integration/test-partial-file-support
+++ b/test/integration/test-partial-file-support
@@ -13,17 +13,18 @@ copysource() {
 	touch -d "$(stat --format '%y' "${TESTFILE}")" "$3"
 }
 
+DOWNLOADLOG='rootdir/tmp/testdownloadfile.log'
+
 testdownloadfile() {
-	local DOWNLOG='download-testfile.log'
-	rm -f "$DOWNLOG"
+	rm -f "$DOWNLOADLOG"
 	msgtest "Testing download of file $2 with" "$1"
-	if ! downloadfile "$2" "$3" > "$DOWNLOG"; then
-		cat >&2 "$DOWNLOG"
+	if ! downloadfile "$2" "$3" > "$DOWNLOADLOG"; then
+		cat >&2 "$DOWNLOADLOG"
 		msgfail
 	else
 		msgpass
 	fi
-	cat "$DOWNLOG" | while read field hash; do
+	cat "$DOWNLOADLOG" | while read field hash; do
 		local EXPECTED
 		case "$field" in
 		'MD5Sum-Hash:') EXPECTED="$(md5sum "$TESTFILE" | cut -d' ' -f 1)";;
@@ -40,28 +41,12 @@ testdownloadfile() {
 		if [ "$EXPECTED" "$4" "$hash" ]; then
 			msgpass
 		else
-			cat >&2 "$DOWNLOG"
+			cat >&2 "$DOWNLOADLOG"
 			msgfail "expected: $EXPECTED ; got: $hash"
 		fi
 	done
 }
 
-testwebserverlaststatuscode() {
-	local DOWNLOG='download-testfile.log'
-	rm -f "$DOWNLOG"
-	local STATUS="$(mktemp)"
-	addtrap "rm $STATUS;"
-	msgtest 'Test last status code from the webserver was' "$1"
-	downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG"
-	if [ "$(cat "$STATUS")" = "$1" ]; then
-		msgpass
-	else
-		cat >&2 "$DOWNLOG"
-		msgfail "Status was $(cat "$STATUS")"
-	fi
-}
-
-
 TESTFILE='aptarchive/testfile'
 cp -a ${TESTDIR}/framework $TESTFILE
 
@@ -70,34 +55,34 @@ testrun() {
 
 	copysource $TESTFILE 0 ./testfile
 	testdownloadfile 'no data' "${1}/testfile" './testfile' '='
-	testwebserverlaststatuscode '200'
+	testwebserverlaststatuscode '200' "$DOWNLOADLOG"
 
 	copysource $TESTFILE 20 ./testfile
 	testdownloadfile 'valid partial data' "${1}/testfile" './testfile' '='
-	testwebserverlaststatuscode '206'
+	testwebserverlaststatuscode '206' "$DOWNLOADLOG"
 
 	copysource /dev/zero 20 ./testfile
 	testdownloadfile 'invalid partial data' "${1}/testfile" './testfile' '!='
-	testwebserverlaststatuscode '206'
+	testwebserverlaststatuscode '206' "$DOWNLOADLOG"
 
 	copysource $TESTFILE 1M ./testfile
 	testdownloadfile 'completely downloaded file' "${1}/testfile" './testfile' '='
-	testwebserverlaststatuscode '416'
+	testwebserverlaststatuscode '416' "$DOWNLOADLOG"
 
 	copysource /dev/zero 1M ./testfile
 	testdownloadfile 'too-big partial file' "${1}/testfile" './testfile' '='
-	testwebserverlaststatuscode '200'
+	testwebserverlaststatuscode '200' "$DOWNLOADLOG"
 
 	copysource /dev/zero 20 ./testfile
 	touch ./testfile
 	testdownloadfile 'old data' "${1}/testfile" './testfile' '='
-	testwebserverlaststatuscode '200'
+	testwebserverlaststatuscode '200' "$DOWNLOADLOG"
 
 	webserverconfig 'aptwebserver::support::range' 'false'
 
 	copysource $TESTFILE 20 ./testfile
 	testdownloadfile 'no server support' "${1}/testfile" './testfile' '='
-	testwebserverlaststatuscode '200'
+	testwebserverlaststatuscode '200' "$DOWNLOADLOG"
 }
 
 testrun 'http://localhost:8080'
diff --git a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew
index fed12dad0..d647856cb 100755
--- a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew
+++ b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew
@@ -55,14 +55,14 @@ Remv out-of-sync-gone-foreign:i386 [1]
 Remv out-of-sync-gone-native [1]
 Inst fine [1] (2 unstable [amd64]) [fine:amd64 on fine:i386] [fine:i386 on fine:amd64] [fine:i386 ]
 Inst fine:i386 [1] (2 unstable [i386])
-Conf fine (2 unstable [amd64])
-Conf fine:i386 (2 unstable [i386])
 Inst fine-installed [1] (2 unstable [amd64]) [fine-installed:amd64 on fine-installed:i386] [fine-installed:i386 on fine-installed:amd64] [fine-installed:i386 ]
 Inst fine-installed:i386 [1] (2 unstable [i386])
-Conf fine-installed (2 unstable [amd64])
-Conf fine-installed:i386 (2 unstable [i386])
 Inst out-of-sync-gone-foreign [1] (2 unstable [amd64])
 Inst out-of-sync-gone-native:i386 [1] (2 unstable [i386])
+Conf fine:i386 (2 unstable [i386])
+Conf fine (2 unstable [amd64])
+Conf fine-installed:i386 (2 unstable [i386])
+Conf fine-installed (2 unstable [amd64])
 Conf out-of-sync-gone-foreign (2 unstable [amd64])
 Conf out-of-sync-gone-native:i386 (2 unstable [i386])' aptget dist-upgrade -s #-o Debug::pkgDepCache::Marker=1
 
diff --git a/test/integration/test-bug-1078697-missing-source-hashes b/test/integration/test-ubuntu-bug-1078697-missing-source-hashes
index 6fcb856b5..6fcb856b5 100755
--- a/test/integration/test-bug-1078697-missing-source-hashes
+++ b/test/integration/test-ubuntu-bug-1078697-missing-source-hashes
diff --git a/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard b/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
new file mode 100755
index 000000000..2f2d384e1
--- /dev/null
+++ b/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
@@ -0,0 +1,48 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'i386'
+
+# Regression test for LP: #1304403
+#
+# The issue here is that libkadm5srv-mit8 (priority standard) is replaced
+# by a new libkadm5srv-mit9 and libkbd5-7 breaks on the old -mit8 package.
+# The -mit8 package is no longer downloadable (and hence not upgradeable)
+
+# normal upradable pkg
+#  (libkdb5-7 that breaks on libkadm5srv-mit8 (<< 1.11+dfsg~)
+insertinstalledpackage 'upgradable' 'all' '1.0' '' 'extra'
+insertpackage 'unstable' 'upgradable' 'all' '2.0' 'Breaks: not-downloadable (<< 1.1)' 'optional'
+
+# no longer downloadable pkg (libkadm5srv-mit8, replaced by libkadm5srv-mit9)
+# but priority standard pushes it higher
+insertinstalledpackage 'not-downloadable' 'all' '1.0' '' 'standard'
+
+setupaptarchive
+
+# discourage keeping obsolete high-priority packages …
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be REMOVED:
+  not-downloadable
+The following packages will be upgraded:
+  upgradable
+1 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
+Remv not-downloadable [1.0]
+Inst upgradable [1.0] (2.0 unstable [all])
+Conf upgradable (2.0 unstable [all])' aptget -s dist-upgrade
+
+# … but if it has dependencies we want to keep it as usual
+for i in $(seq 1 10); do
+insertinstalledpackage "depender$i" 'all' '1.0' 'Depends: not-downloadable'
+done
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages have been kept back:
+  upgradable
+0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.' aptget -s dist-upgrade
diff --git a/test/integration/test-ubuntu-bug-365611-long-package-names b/test/integration/test-ubuntu-bug-365611-long-package-names
index 894c8dc97..f22986e21 100755
--- a/test/integration/test-ubuntu-bug-365611-long-package-names
+++ b/test/integration/test-ubuntu-bug-365611-long-package-names
@@ -4,8 +4,12 @@ set -e
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 setupenvironment
-configarchitecture "i386"
+configarchitecture 'i386'
 setupaptarchive
 
 aptget install $(for i in $(seq 0 1000); do echo -n 'a'; done) 2> longpackagename.log > /dev/null || true
 testfileequal 'longpackagename.log' "E: Unable to locate package $(for i in $(seq 0 1000); do echo -n 'a'; done)"
+
+# … and the opposite of long:
+aptget install "" -s >longpackagename.log 2>&1 || true
+testfileequal 'longpackagename.log' "$(aptget install -s)"
diff --git a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
index 5856cd744..c1d454f88 100755
--- a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
+++ b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
@@ -39,9 +39,9 @@ Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-core:amd64 on libreoffice
 Inst libreoffice-common [3] (4 sid [all]) []
 Inst ure (4 sid [amd64])
 Conf ure (4 sid [amd64])
-Conf libreoffice-style-galaxy (4 sid [amd64])
 Conf libreoffice-common (4 sid [all])
 Conf libreoffice-core (4 sid [amd64])
+Conf libreoffice-style-galaxy (4 sid [amd64])
 Conf libreoffice (4 sid [amd64])' 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
@@ -55,7 +55,7 @@ Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffi
 Inst libreoffice-common [3] (4 sid [all]) []
 Inst ure (4 sid [amd64])
 Conf ure (4 sid [amd64])
-Conf libreoffice-style-galaxy (4 sid [amd64])
 Conf libreoffice-common (4 sid [all])
 Conf libreoffice-core (4 sid [amd64])
+Conf libreoffice-style-galaxy (4 sid [amd64])
 Conf libreoffice (4 sid [amd64])' aptget dist-upgrade -s
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index 992f802a6..34476e1af 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -1,29 +1,31 @@
 #include <config.h>
 
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/init.h>
-
-#include <vector>
-#include <string>
-#include <list>
-#include <sstream>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 
+#include <dirent.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include <pthread.h>
+#include <regex.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <errno.h>
 #include <time.h>
-#include <stdlib.h>
-#include <dirent.h>
-#include <signal.h>
+#include <unistd.h>
+#include <iostream>
+#include <sstream>
+#include <list>
+#include <string>
+#include <vector>
 
-char const * const httpcodeToStr(int const httpcode)			/*{{{*/
+static char const * httpcodeToStr(int const httpcode)		/*{{{*/
 {
    switch (httpcode)
    {
@@ -77,7 +79,7 @@ char const * const httpcodeToStr(int const httpcode)			/*{{{*/
    return NULL;
 }
 									/*}}}*/
-void addFileHeaders(std::list<std::string> &headers, FileFd &data)	/*{{{*/
+static void addFileHeaders(std::list<std::string> &headers, FileFd &data)/*{{{*/
 {
    std::ostringstream contentlength;
    contentlength << "Content-Length: " << data.FileSize();
@@ -88,14 +90,14 @@ void addFileHeaders(std::list<std::string> &headers, FileFd &data)	/*{{{*/
    headers.push_back(lastmodified);
 }
 									/*}}}*/
-void addDataHeaders(std::list<std::string> &headers, std::string &data)	/*{{{*/
+static void addDataHeaders(std::list<std::string> &headers, std::string &data)/*{{{*/
 {
    std::ostringstream contentlength;
    contentlength << "Content-Length: " << data.size();
    headers.push_back(contentlength.str());
 }
 									/*}}}*/
-bool sendHead(int const client, int const httpcode, std::list<std::string> &headers)/*{{{*/
+static bool sendHead(int const client, int const httpcode, std::list<std::string> &headers)/*{{{*/
 {
    std::string response("HTTP/1.1 ");
    response.append(httpcodeToStr(httpcode));
@@ -128,7 +130,7 @@ bool sendHead(int const client, int const httpcode, std::list<std::string> &head
    return Success;
 }
 									/*}}}*/
-bool sendFile(int const client, FileFd &data)				/*{{{*/
+static bool sendFile(int const client, FileFd &data)			/*{{{*/
 {
    bool Success = true;
    char buffer[500];
@@ -144,7 +146,7 @@ bool sendFile(int const client, FileFd &data)				/*{{{*/
    return Success;
 }
 									/*}}}*/
-bool sendData(int const client, std::string const &data)		/*{{{*/
+static bool sendData(int const client, std::string const &data)		/*{{{*/
 {
    if (FileFd::Write(client, data.c_str(), data.size()) == false)
    {
@@ -154,7 +156,7 @@ bool sendData(int const client, std::string const &data)		/*{{{*/
    return true;
 }
 									/*}}}*/
-void sendError(int const client, int const httpcode, std::string const &request,/*{{{*/
+static void sendError(int const client, int const httpcode, std::string const &request,/*{{{*/
 	       bool content, std::string const &error = "")
 {
    std::list<std::string> headers;
@@ -179,13 +181,13 @@ void sendError(int const client, int const httpcode, std::string const &request,
    if (content == true)
       sendData(client, response);
 }
-void sendSuccess(int const client, std::string const &request,
+static void sendSuccess(int const client, std::string const &request,
 	       bool content, std::string const &error = "")
 {
    sendError(client, 200, request, content, error);
 }
 									/*}}}*/
-void sendRedirect(int const client, int const httpcode, std::string const &uri,/*{{{*/
+static void sendRedirect(int const client, int const httpcode, std::string const &uri,/*{{{*/
 		  std::string const &request, bool content)
 {
    std::list<std::string> headers;
@@ -222,7 +224,7 @@ void sendRedirect(int const client, int const httpcode, std::string const &uri,/
       sendData(client, response);
 }
 									/*}}}*/
-int filter_hidden_files(const struct dirent *a)				/*{{{*/
+static int filter_hidden_files(const struct dirent *a)			/*{{{*/
 {
    if (a->d_name[0] == '.')
       return 0;
@@ -236,7 +238,7 @@ int filter_hidden_files(const struct dirent *a)				/*{{{*/
 #endif
    return 1;
 }
-int grouped_alpha_case_sort(const struct dirent **a, const struct dirent **b) {
+static int grouped_alpha_case_sort(const struct dirent **a, const struct dirent **b) {
 #ifdef _DIRENT_HAVE_D_TYPE
    if ((*a)->d_type == DT_DIR && (*b)->d_type == DT_DIR);
    else if ((*a)->d_type == DT_DIR && (*b)->d_type == DT_REG)
@@ -260,7 +262,7 @@ int grouped_alpha_case_sort(const struct dirent **a, const struct dirent **b) {
    return strcasecmp((*a)->d_name, (*b)->d_name);
 }
 									/*}}}*/
-void sendDirectoryListing(int const client, std::string const &dir,	/*{{{*/
+static void sendDirectoryListing(int const client, std::string const &dir,/*{{{*/
 			  std::string const &request, bool content)
 {
    std::list<std::string> headers;
@@ -312,7 +314,7 @@ void sendDirectoryListing(int const client, std::string const &dir,	/*{{{*/
       sendData(client, response);
 }
 									/*}}}*/
-bool parseFirstLine(int const client, std::string const &request,	/*{{{*/
+static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
 		    std::string &filename, std::string &params, bool &sendContent,
 		    bool &closeConnection)
 {
@@ -432,7 +434,7 @@ bool parseFirstLine(int const client, std::string const &request,	/*{{{*/
    return true;
 }
 									/*}}}*/
-bool handleOnTheFlyReconfiguration(int const client, std::string const &request, std::vector<std::string> const &parts)/*{{{*/
+static bool handleOnTheFlyReconfiguration(int const client, std::string const &request, std::vector<std::string> const &parts)/*{{{*/
 {
    size_t const pcount = parts.size();
    if (pcount == 4 && parts[1] == "set")
@@ -475,7 +477,7 @@ bool handleOnTheFlyReconfiguration(int const client, std::string const &request,
    return false;
 }
 									/*}}}*/
-void * handleClient(void * voidclient)					/*{{{*/
+static void * handleClient(void * voidclient)				/*{{{*/
 {
    int client = *((int*)(voidclient));
    std::clog << "ACCEPT client " << client << std::endl;
diff --git a/test/interactive-helper/extract-control.cc b/test/interactive-helper/extract-control.cc
index 3f7feabcb..852ec4ee9 100644
--- a/test/interactive-helper/extract-control.cc
+++ b/test/interactive-helper/extract-control.cc
@@ -1,13 +1,16 @@
+#include <config.h>
+
 #include <apt-pkg/debfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 
+#include <string>
 #include <iostream>
 #include <unistd.h>
 
 using namespace std;
 
-bool ExtractMember(const char *File,const char *Member)
+static bool ExtractMember(const char *File,const char *Member)
 {
    FileFd Fd(File,FileFd::ReadOnly);
    debDebFile Deb(Fd);
diff --git a/test/interactive-helper/mthdcat.cc b/test/interactive-helper/mthdcat.cc
index 25d09a3f5..2961b2080 100644
--- a/test/interactive-helper/mthdcat.cc
+++ b/test/interactive-helper/mthdcat.cc
@@ -2,6 +2,8 @@
    All this does is cat a file into the method without closing the FD when
    the file ends */
 
+#include <config.h>
+
 #include <unistd.h>
 
 int main()
diff --git a/test/interactive-helper/rpmver.cc b/test/interactive-helper/rpmver.cc
index 15c96cbbe..017c92fba 100644
--- a/test/interactive-helper/rpmver.cc
+++ b/test/interactive-helper/rpmver.cc
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <apt-pkg/debversion.h>
 #include <rpm/rpmio.h>
 #include <rpm/misc.h>
diff --git a/test/interactive-helper/test_udevcdrom.cc b/test/interactive-helper/test_udevcdrom.cc
index 88f5f0153..b87dcd935 100644
--- a/test/interactive-helper/test_udevcdrom.cc
+++ b/test/interactive-helper/test_udevcdrom.cc
@@ -1,7 +1,10 @@
+#include <config.h>
+
 #include <apt-pkg/cdrom.h>
-#include <stdio.h>
-#include <assert.h>
 
+#include <stddef.h>
+#include <string>
+#include <assert.h>
 #include <vector>
 #include <iostream>
 
@@ -17,5 +20,4 @@ int main()
       std::cerr << l[i].DeviceName << " " 
 		<< l[i].Mounted << " " 
 		<< l[i].MountPath << std::endl;
-   
 }
diff --git a/test/interactive-helper/testdeb.cc b/test/interactive-helper/testdeb.cc
index d28f20114..6aae9f563 100644
--- a/test/interactive-helper/testdeb.cc
+++ b/test/interactive-helper/testdeb.cc
@@ -1,15 +1,22 @@
+#include <config.h>
+
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/debfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/extracttar.h>
+#include <apt-pkg/arfile.h>
+#include <apt-pkg/fileutl.h>
+
+#include <iostream>
+#include <string>
 
 class NullStream : public pkgDirStream
 {
    public:
-   virtual bool DoItem(Item &Itm,int &Fd) {return true;};
+   virtual bool DoItem(Item &/*Itm*/, int &/*Fd*/) {return true;};
 };
 
-bool Test(const char *File)
+static bool Test(const char *File)
 {
    FileFd Fd(File,FileFd::ReadOnly);
    debDebFile Deb(Fd);
@@ -33,6 +40,11 @@ bool Test(const char *File)
 
 int main(int argc, const char *argv[])
 {
+   if (argc != 2) {
+      std::cout << "One parameter expected - given " << argc << std::endl;
+      return 100;
+   }
+
    Test(argv[1]);
    _error->DumpErrors();
    return 0;
diff --git a/test/libapt/assert.h b/test/libapt/assert.h
deleted file mode 100644
index 113c057ed..000000000
--- a/test/libapt/assert.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#include <iostream>
-#include <cstdlib>
-
-#define equals(x,y) assertEquals(y, x, __LINE__)
-#define equalsNot(x,y) assertEqualsNot(y, x, __LINE__)
-
-template < typename X, typename Y >
-void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) {
-	std::cerr << "Test FAILED: »" << expect << "« " << compare << " »" << get << "« at line " << line << std::endl;
-	std::exit(EXIT_FAILURE);
-}
-
-template < typename X, typename Y >
-void assertEquals(X expect, Y get, unsigned long const &line) {
-	if (expect == get)
-		return;
-	OutputAssertEqual(expect, "==", get, line);
-}
-
-template < typename X, typename Y >
-void assertEqualsNot(X expect, Y get, unsigned long const &line) {
-	if (expect != get)
-		return;
-	OutputAssertEqual(expect, "!=", get, line);
-}
-
-void assertEquals(unsigned int const &expect, int const &get, unsigned long const &line) {
-	if (get < 0)
-		OutputAssertEqual(expect, "==", get, line);
-	assertEquals<unsigned int const&, unsigned int const&>(expect, get, line);
-}
-
-void assertEquals(int const &expect, unsigned int const &get, unsigned long const &line) {
-	if (expect < 0)
-		OutputAssertEqual(expect, "==", get, line);
-	assertEquals<unsigned int const&, unsigned int const&>(expect, get, line);
-}
-
-void assertEquals(unsigned long const &expect, int const &get, unsigned long const &line) {
-	if (get < 0)
-		OutputAssertEqual(expect, "==", get, line);
-	assertEquals<unsigned long const&, unsigned long const&>(expect, get, line);
-}
-
-void assertEquals(int const &expect, unsigned long const &get, unsigned long const &line) {
-	if (expect < 0)
-		OutputAssertEqual(expect, "==", get, line);
-	assertEquals<unsigned long const&, unsigned long const&>(expect, get, line);
-}
-
-
-#define equalsOr2(x,y,z) assertEqualsOr2(y, z, x, __LINE__)
-
-template < typename X, typename Y >
-void OutputAssertEqualOr2(X expect1, X expect2, char const* compare, Y get, unsigned long const &line) {
-	std::cerr << "Test FAILED: »" << expect1 << "« or »" << expect2 << "« " << compare << " »" << get << "« at line " << line << std::endl;
-}
-
-template < typename X, typename Y >
-void assertEqualsOr2(X expect1, X expect2, Y get, unsigned long const &line) {
-	if (expect1 == get || expect2 == get)
-		return;
-	OutputAssertEqualOr2(expect1, expect2, "==", get, line);
-}
-
-void assertEqualsOr2(unsigned int const &expect1, unsigned int const &expect2, int const &get, unsigned long const &line) {
-	if (get < 0)
-		OutputAssertEqualOr2(expect1, expect2, "==", get, line);
-	assertEqualsOr2<unsigned int const&, unsigned int const&>(expect1, expect2, get, line);
-}
-
-void assertEqualsOr2(int const &expect1, int const &expect2, unsigned int const &get, unsigned long const &line) {
-	if (expect1 < 0 && expect2 < 0)
-		OutputAssertEqualOr2(expect1, expect2, "==", get, line);
-	assertEqualsOr2<unsigned int const&, unsigned int const&>(expect1, expect2, get, line);
-}
-
-
-#define equalsOr3(w,x,y,z) assertEqualsOr3(x, y, z, w, __LINE__)
-
-template < typename X, typename Y >
-void OutputAssertEqualOr3(X expect1, X expect2, X expect3, char const* compare, Y get, unsigned long const &line) {
-	std::cerr << "Test FAILED: »" << expect1 << "« or »" << expect2 << "« or »" << expect3 << "« " << compare << " »" << get << "« at line " << line << std::endl;
-}
-
-template < typename X, typename Y >
-void assertEqualsOr3(X expect1, X expect2, X expect3, Y get, unsigned long const &line) {
-	if (expect1 == get || expect2 == get || expect3 == get)
-		return;
-	OutputAssertEqualOr3(expect1, expect2, expect3, "==", get, line);
-}
-
-#define equalsOr4(v,w,x,y,z) assertEqualsOr4(w, x, y, z, v, __LINE__)
-
-template < typename X, typename Y >
-void OutputAssertEqualOr4(X expect1, X expect2, X expect3, X expect4, char const* compare, Y get, unsigned long const &line) {
-	std::cerr << "Test FAILED: »" << expect1 << "« or »" << expect2 << "« or »" << expect3 << "« or »" << expect4 << "« " << compare << " »" << get << "« at line " << line << std::endl;
-}
-
-template < typename X, typename Y >
-void assertEqualsOr4(X expect1, X expect2, X expect3, X expect4, Y get, unsigned long const &line) {
-	if (expect1 == get || expect2 == get || expect3 == get || expect4 == get)
-		return;
-	OutputAssertEqualOr4(expect1, expect2, expect3, expect4, "==", get, line);
-}
-
-// simple helper to quickly output a vectors
-template < typename X >
-void dumpVector(X vec) {
-	for (typename X::const_iterator v = vec.begin();
-	     v != vec.end(); ++v)
-		std::cout << *v << std::endl;
-}
diff --git a/test/libapt/cdrom_test.cc b/test/libapt/cdrom_test.cc
new file mode 100644
index 000000000..626ef538e
--- /dev/null
+++ b/test/libapt/cdrom_test.cc
@@ -0,0 +1,114 @@
+#include <config.h>
+
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/cdrom.h>
+#include <apt-pkg/cdromutl.h>
+#include <apt-pkg/fileutl.h>
+
+#include <string>
+#include <string.h>
+#include <vector>
+
+#include <gtest/gtest.h>
+
+#include "file-helpers.h"
+
+class Cdrom : public pkgCdrom {
+public:
+   std::vector<std::string> ReduceSourcelist(std::string CD,std::vector<std::string> List) {
+      pkgCdrom::ReduceSourcelist(CD, List);
+      return List;
+   }
+};
+
+TEST(CDROMTest,ReduceSourcelist)
+{
+   Cdrom cd;
+   std::vector<std::string> List;
+   std::string CD("/media/cdrom/");
+
+   std::vector<std::string> R = cd.ReduceSourcelist(CD, List);
+   EXPECT_TRUE(R.empty());
+
+   List.push_back(" wheezy main");
+   R = cd.ReduceSourcelist(CD, List);
+   ASSERT_EQ(1, R.size());
+   EXPECT_EQ(" wheezy main", R[0]);
+
+   List.push_back(" wheezy main");
+   R = cd.ReduceSourcelist(CD, List);
+   ASSERT_EQ(1, R.size());
+   EXPECT_EQ(" wheezy main", R[0]);
+
+   List.push_back(" wheezy contrib");
+   R = cd.ReduceSourcelist(CD, List);
+   ASSERT_EQ(1, R.size());
+   EXPECT_EQ(" wheezy contrib main", R[0]);
+
+   List.push_back(" wheezy-update contrib");
+   R = cd.ReduceSourcelist(CD, List);
+   ASSERT_EQ(2, R.size());
+   EXPECT_EQ(" wheezy contrib main", R[0]);
+   EXPECT_EQ(" wheezy-update contrib", R[1]);
+
+   List.push_back(" wheezy-update contrib");
+   R = cd.ReduceSourcelist(CD, List);
+   ASSERT_EQ(2, R.size());
+   EXPECT_EQ(" wheezy contrib main", R[0]);
+   EXPECT_EQ(" wheezy-update contrib", R[1]);
+
+   List.push_back(" wheezy-update non-free");
+   R = cd.ReduceSourcelist(CD, List);
+   ASSERT_EQ(2, R.size());
+   EXPECT_EQ(" wheezy contrib main", R[0]);
+   EXPECT_EQ(" wheezy-update contrib non-free", R[1]);
+
+   List.push_back(" wheezy-update main");
+   R = cd.ReduceSourcelist(CD, List);
+   ASSERT_EQ(2, R.size());
+   EXPECT_EQ(" wheezy contrib main", R[0]);
+   EXPECT_EQ(" wheezy-update contrib main non-free", R[1]);
+
+   List.push_back(" wheezy non-free");
+   R = cd.ReduceSourcelist(CD, List);
+   ASSERT_EQ(2, R.size());
+   EXPECT_EQ(" wheezy contrib main non-free", R[0]);
+   EXPECT_EQ(" wheezy-update contrib main non-free", R[1]);
+
+   List.push_back(" sid main");
+   R = cd.ReduceSourcelist(CD, List);
+   ASSERT_EQ(3, R.size());
+   EXPECT_EQ(" sid main", R[0]);
+   EXPECT_EQ(" wheezy contrib main non-free", R[1]);
+   EXPECT_EQ(" wheezy-update contrib main non-free", R[2]);
+
+   List.push_back(" sid main-reduce");
+   R = cd.ReduceSourcelist(CD, List);
+   ASSERT_EQ(3, R.size());
+   EXPECT_EQ(" sid main main-reduce", R[0]);
+   EXPECT_EQ(" wheezy contrib main non-free", R[1]);
+   EXPECT_EQ(" wheezy-update contrib main non-free", R[2]);
+}
+TEST(CDROMTest, FindMountPointForDevice)
+{
+   char * tempfile;
+   FileFd fd;
+   createTemporaryFile("mountpoints", fd, &tempfile,
+	 "rootfs / rootfs rw 0 0\n"
+	 "sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0\n"
+	 "sysfs0 /sys0 sysfs rw,nosuid,nodev,noexec,relatime 0 0\n"
+	 "/dev/disk/by-uuid/fadcbc52-6284-4874-aaaa-dcee1f05fe21 / ext4 rw,relatime,errors=remount-ro,data=ordered 0 0\n"
+	 "/dev/sda1 /boot/efi vfat rw,nosuid,nodev,noexec,relatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=utf8,shortname=lower,quiet,utf8,errors=remount-ro,rw,nosuid,nodev,noexec,relatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=utf8,shortname=lower,quiet,utf8,errors=remount-ro,rw,nosuid,nodev,noexec,relatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=utf8,shortname=lower,quiet,utf8,errors=remount-ro,rw,nosuid,nodev,noexec,relatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=utf8,shortname=lower,quiet,utf8,errors=remount-ro 0 0\n"
+	 "tmpfs /tmp tmpfs rw,nosuid,nodev,relatime 0 0\n");
+   _config->Set("Dir::state::Mountpoints", tempfile);
+
+   EXPECT_EQ("/", FindMountPointForDevice("rootfs"));
+   EXPECT_EQ("/", FindMountPointForDevice("/dev/disk/by-uuid/fadcbc52-6284-4874-aaaa-dcee1f05fe21"));
+   EXPECT_EQ("/sys", FindMountPointForDevice("sysfs"));
+   EXPECT_EQ("/sys0", FindMountPointForDevice("sysfs0"));
+   EXPECT_EQ("/boot/efi", FindMountPointForDevice("/dev/sda1"));
+   EXPECT_EQ("/tmp", FindMountPointForDevice("tmpfs"));
+
+   unlink(tempfile);
+   free(tempfile);
+}
diff --git a/test/libapt/cdromfindpackages_test.cc b/test/libapt/cdromfindpackages_test.cc
index e9f5a51b0..719dd8f63 100644
--- a/test/libapt/cdromfindpackages_test.cc
+++ b/test/libapt/cdromfindpackages_test.cc
@@ -1,86 +1,121 @@
+#include <config.h>
+
 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
 
 #include <algorithm>
 #include <string>
 #include <vector>
+#include <stddef.h>
+#include <iostream>
+
+#include <gtest/gtest.h>
 
-#include "assert.h"
+#include "file-helpers.h"
 
 class Cdrom : public pkgCdrom {
-	public:
-	bool FindPackages(std::string const &CD,
-			  std::vector<std::string> &List,
-			  std::vector<std::string> &SList,
-			  std::vector<std::string> &SigList,
-			  std::vector<std::string> &TransList,
-			  std::string &InfoDir) {
-		bool const result = pkgCdrom::FindPackages(CD, List, SList, SigList, TransList, InfoDir, NULL, 0);
-		std::sort(List.begin(), List.end());
-		std::sort(SList.begin(), SList.end());
-		std::sort(SigList.begin(), SigList.end());
-		std::sort(TransList.begin(), TransList.end());
-		return result;
-	}
+   public:
+      bool FindPackages(std::string const &CD,
+	    std::vector<std::string> &List,
+	    std::vector<std::string> &SList,
+	    std::vector<std::string> &SigList,
+	    std::vector<std::string> &TransList,
+	    std::string &InfoDir) {
+	 std::string const startdir = SafeGetCWD();
+	 EXPECT_FALSE(startdir.empty());
+	 bool const result = pkgCdrom::FindPackages(CD, List, SList, SigList, TransList, InfoDir, NULL, 0);
+	 std::sort(List.begin(), List.end());
+	 std::sort(SList.begin(), SList.end());
+	 std::sort(SigList.begin(), SigList.end());
+	 std::sort(TransList.begin(), TransList.end());
+	 EXPECT_EQ(0, chdir(startdir.c_str()));
+	 return result;
+      }
 
-	bool DropRepeats(std::vector<std::string> &List, char const *Name) {
-		return pkgCdrom::DropRepeats(List, Name);
-	}
+      using pkgCdrom::DropRepeats;
 };
 
-int main(int argc, char const *argv[]) {
-	if (argc != 2) {
-		std::cout << "One parameter expected - given " << argc << std::endl;
-		return 100;
-	}
+TEST(CDROMTest,FindPackages)
+{
+   std::string path;
+   createTemporaryDirectory("findpackage", path);
+
+   createDirectory(path, ".disk");
+   createDirectory(path, "pool");
+   createDirectory(path, "dists/stable/main/binary-i386");
+   createDirectory(path, "dists/stable/main/source");
+   createDirectory(path, "dists/stable/contrib/binary-amd64");
+   createDirectory(path, "dists/stable/contrib/binary-all");
+   createDirectory(path, "dists/unstable/main/binary-i386");
+   createDirectory(path, "dists/unstable/main/i18n");
+   createDirectory(path, "dists/unstable/main/source");
+   createDirectory(path, "dists/broken/non-free/source");
+   createFile(path, "dists/broken/.aptignr");
+   createFile(path, "dists/stable/main/binary-i386/Packages");
+   createFile(path, "dists/stable/main/binary-i386/Packages.bz2");
+   createFile(path, "dists/stable/main/source/Sources.xz");
+   createFile(path, "dists/stable/contrib/binary-amd64/Packages");
+   createFile(path, "dists/stable/contrib/binary-amd64/Packages.gz");
+   createFile(path, "dists/stable/contrib/binary-all/Packages");
+   createFile(path, "dists/unstable/main/binary-i386/Packages.xz");
+   createFile(path, "dists/unstable/main/binary-i386/Packages.lzma");
+   createFile(path, "dists/unstable/main/i18n/Translation-en");
+   createFile(path, "dists/unstable/main/i18n/Translation-de.bz2");
+   createFile(path, "dists/unstable/main/source/Sources.xz");
+   createFile(path, "dists/broken/non-free/source/Sources.gz");
+   createFile(path, "dists/stable/Release.gpg");
+   createFile(path, "dists/stable/Release");
+   createFile(path, "dists/unstable/InRelease");
+   createFile(path, "dists/broken/Release.gpg");
+   createLink(path, "dists/unstable", "dists/sid");
 
-	Cdrom cd;
-	std::vector<std::string> Packages, Sources, Signatur, Translation;
-	std::string InfoDir;
-	std::string path = argv[1];
-	equals(true, cd.FindPackages(path, Packages, Sources, Signatur, Translation, InfoDir));
-	equals(4, Packages.size());
-	equals(path + "/dists/sid/main/binary-i386/", Packages[0]);
-	equals(path + "/dists/stable/contrib/binary-amd64/", Packages[1]);
-	equals(path + "/dists/stable/main/binary-i386/", Packages[2]);
-	equals(path + "/dists/unstable/main/binary-i386/", Packages[3]);
-	equals(3, Sources.size());
-	equals(path + "/dists/sid/main/source/", Sources[0]);
-	equals(path + "/dists/stable/main/source/", Sources[1]);
-	equals(path + "/dists/unstable/main/source/", Sources[2]);
-	equals(3, Signatur.size());
-	equals(path + "/dists/sid/", Signatur[0]);
-	equals(path + "/dists/stable/", Signatur[1]);
-	equals(path + "/dists/unstable/", Signatur[2]);
-	equals(4, Translation.size());
-	equals(path + "/dists/sid/main/i18n/Translation-de", Translation[0]);
-	equals(path + "/dists/sid/main/i18n/Translation-en", Translation[1]);
-	equals(path + "/dists/unstable/main/i18n/Translation-de", Translation[2]);
-	equals(path + "/dists/unstable/main/i18n/Translation-en", Translation[3]);
-	equals(path + "/.disk/", InfoDir);
+   Cdrom cd;
+   std::vector<std::string> Packages, Sources, Signatur, Translation;
+   std::string InfoDir;
+   EXPECT_TRUE(cd.FindPackages(path, Packages, Sources, Signatur, Translation, InfoDir));
+   EXPECT_EQ(4, Packages.size());
+   EXPECT_EQ(path + "/dists/sid/main/binary-i386/", Packages[0]);
+   EXPECT_EQ(path + "/dists/stable/contrib/binary-amd64/", Packages[1]);
+   EXPECT_EQ(path + "/dists/stable/main/binary-i386/", Packages[2]);
+   EXPECT_EQ(path + "/dists/unstable/main/binary-i386/", Packages[3]);
+   EXPECT_EQ(3, Sources.size());
+   EXPECT_EQ(path + "/dists/sid/main/source/", Sources[0]);
+   EXPECT_EQ(path + "/dists/stable/main/source/", Sources[1]);
+   EXPECT_EQ(path + "/dists/unstable/main/source/", Sources[2]);
+   EXPECT_EQ(3, Signatur.size());
+   EXPECT_EQ(path + "/dists/sid/", Signatur[0]);
+   EXPECT_EQ(path + "/dists/stable/", Signatur[1]);
+   EXPECT_EQ(path + "/dists/unstable/", Signatur[2]);
+   EXPECT_EQ(4, Translation.size());
+   EXPECT_EQ(path + "/dists/sid/main/i18n/Translation-de", Translation[0]);
+   EXPECT_EQ(path + "/dists/sid/main/i18n/Translation-en", Translation[1]);
+   EXPECT_EQ(path + "/dists/unstable/main/i18n/Translation-de", Translation[2]);
+   EXPECT_EQ(path + "/dists/unstable/main/i18n/Translation-en", Translation[3]);
+   EXPECT_EQ(path + "/.disk/", InfoDir);
 
-	cd.DropRepeats(Packages, "Packages");
-	cd.DropRepeats(Sources, "Sources");
-	_error->PushToStack();
-	cd.DropRepeats(Signatur, "InRelease");
-	cd.DropRepeats(Signatur, "Release.gpg");
-	_error->RevertToStack();
-	_error->DumpErrors();
-	cd.DropRepeats(Translation, "");
+   cd.DropRepeats(Packages, "Packages");
+   cd.DropRepeats(Sources, "Sources");
+   _error->PushToStack();
+   cd.DropRepeats(Signatur, "InRelease");
+   cd.DropRepeats(Signatur, "Release.gpg");
+   _error->RevertToStack();
+   _error->DumpErrors();
+   cd.DropRepeats(Translation, "");
 
-	equals(3, Packages.size());
-	equals(path + "/dists/stable/contrib/binary-amd64/", Packages[0]);
-	equals(path + "/dists/stable/main/binary-i386/", Packages[1]);
-	equals(path + "/dists/unstable/main/binary-i386/", Packages[2]);
-	equals(2, Sources.size());
-	equals(path + "/dists/stable/main/source/", Sources[0]);
-	equals(path + "/dists/unstable/main/source/", Sources[1]);
-	equals(2, Signatur.size());
-	equals(path + "/dists/stable/", Signatur[0]);
-	equals(path + "/dists/unstable/", Signatur[1]);
-	equals(2, Translation.size());
-	equals(path + "/dists/unstable/main/i18n/Translation-de", Translation[0]);
-	equals(path + "/dists/unstable/main/i18n/Translation-en", Translation[1]);
+   EXPECT_EQ(3, Packages.size());
+   EXPECT_EQ(path + "/dists/stable/contrib/binary-amd64/", Packages[0]);
+   EXPECT_EQ(path + "/dists/stable/main/binary-i386/", Packages[1]);
+   EXPECT_EQ(path + "/dists/unstable/main/binary-i386/", Packages[2]);
+   EXPECT_EQ(2, Sources.size());
+   EXPECT_EQ(path + "/dists/stable/main/source/", Sources[0]);
+   EXPECT_EQ(path + "/dists/unstable/main/source/", Sources[1]);
+   EXPECT_EQ(2, Signatur.size());
+   EXPECT_EQ(path + "/dists/stable/", Signatur[0]);
+   EXPECT_EQ(path + "/dists/unstable/", Signatur[1]);
+   EXPECT_EQ(2, Translation.size());
+   EXPECT_EQ(path + "/dists/unstable/main/i18n/Translation-de", Translation[0]);
+   EXPECT_EQ(path + "/dists/unstable/main/i18n/Translation-en", Translation[1]);
 
-	return 0;
+   removeDirectory(path);
 }
diff --git a/test/libapt/cdromreducesourcelist_test.cc b/test/libapt/cdromreducesourcelist_test.cc
deleted file mode 100644
index 729da23a6..000000000
--- a/test/libapt/cdromreducesourcelist_test.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <apt-pkg/cdrom.h>
-#include <apt-pkg/error.h>
-
-#include <algorithm>
-#include <string>
-#include <vector>
-
-#include "assert.h"
-
-class Cdrom : public pkgCdrom {
-public:
-   std::vector<std::string> ReduceSourcelist(std::string CD,std::vector<std::string> List) {
-      pkgCdrom::ReduceSourcelist(CD, List);
-      return List;
-   }
-};
-
-int main(int argc, char const *argv[]) {
-   Cdrom cd;
-   std::vector<std::string> List;
-   std::string CD("/media/cdrom/");
-
-   std::vector<std::string> R = cd.ReduceSourcelist(CD, List);
-   equals(R.empty(), true);
-
-   List.push_back(" wheezy main");
-   R = cd.ReduceSourcelist(CD, List);
-   equals(R.size(), 1);
-   equals(R[0], " wheezy main");
-
-   List.push_back(" wheezy main");
-   R = cd.ReduceSourcelist(CD, List);
-   equals(R.size(), 1);
-   equals(R[0], " wheezy main");
-
-   List.push_back(" wheezy contrib");
-   R = cd.ReduceSourcelist(CD, List);
-   equals(R.size(), 1);
-   equals(R[0], " wheezy contrib main");
-
-   List.push_back(" wheezy-update contrib");
-   R = cd.ReduceSourcelist(CD, List);
-   equals(R.size(), 2);
-   equals(R[0], " wheezy contrib main");
-   equals(R[1], " wheezy-update contrib");
-
-   List.push_back(" wheezy-update contrib");
-   R = cd.ReduceSourcelist(CD, List);
-   equals(R.size(), 2);
-   equals(R[0], " wheezy contrib main");
-   equals(R[1], " wheezy-update contrib");
-
-   List.push_back(" wheezy-update non-free");
-   R = cd.ReduceSourcelist(CD, List);
-   equals(R.size(), 2);
-   equals(R[0], " wheezy contrib main");
-   equals(R[1], " wheezy-update contrib non-free");
-
-   List.push_back(" wheezy-update main");
-   R = cd.ReduceSourcelist(CD, List);
-   equals(R.size(), 2);
-   equals(R[0], " wheezy contrib main");
-   equals(R[1], " wheezy-update contrib main non-free");
-
-   List.push_back(" wheezy non-free");
-   R = cd.ReduceSourcelist(CD, List);
-   equals(R.size(), 2);
-   equals(R[0], " wheezy contrib main non-free");
-   equals(R[1], " wheezy-update contrib main non-free");
-
-   List.push_back(" sid main");
-   R = cd.ReduceSourcelist(CD, List);
-   equals(R.size(), 3);
-   equals(R[0], " sid main");
-   equals(R[1], " wheezy contrib main non-free");
-   equals(R[2], " wheezy-update contrib main non-free");
-
-   List.push_back(" sid main-reduce");
-   R = cd.ReduceSourcelist(CD, List);
-   equals(R.size(), 3);
-   equals(R[0], " sid main main-reduce");
-   equals(R[1], " wheezy contrib main non-free");
-   equals(R[2], " wheezy-update contrib main non-free");
-
-   return 0;
-}
diff --git a/test/libapt/commandline_test.cc b/test/libapt/commandline_test.cc
index de8a30bd6..26e80bfde 100644
--- a/test/libapt/commandline_test.cc
+++ b/test/libapt/commandline_test.cc
@@ -1,32 +1,58 @@
+#include <config.h>
+
 #include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
+
+#include <gtest/gtest.h>
+
+class CLT: public CommandLine {
+   public:
+      std::string static AsString(const char * const * const argv,
+	    unsigned int const argc) {
+	 std::string const static conf = "Commandline::AsString";
+	 _config->Clear(conf);
+	 SaveInConfig(argc, argv);
+	 return _config->Find(conf);
+      }
+};
 
-#include "assert.h"
+#define EXPECT_CMD(x, ...) { const char * const argv[] = { __VA_ARGS__ }; EXPECT_EQ(x, CLT::AsString(argv, sizeof(argv)/sizeof(argv[0]))); }
 
-int main()
+TEST(CommandLineTest,SaveInConfig)
+{
+   EXPECT_CMD("apt-get install -sf",
+	 "apt-get", "install", "-sf");
+   EXPECT_CMD("apt-cache -s apt -so Debug::test=Test",
+	 "apt-cache", "-s", "apt", "-so", "Debug::test=Test");
+   EXPECT_CMD("apt-cache -s apt -so Debug::test=\"Das ist ein Test\"",
+	 "apt-cache", "-s", "apt", "-so", "Debug::test=Das ist ein Test");
+   EXPECT_CMD("apt-cache -s apt --hallo test=1.0",
+	 "apt-cache", "-s", "apt", "--hallo", "test=1.0");
+}
+TEST(CommandLineTest,Parsing)
 {
    CommandLine::Args Args[] = {
       { 't', 0, "Test::Worked", 0 },
       { 'z', "zero", "Test::Zero", 0 },
       {0,0,0,0}
    };
-   CommandLine CmdL(Args,_config);
+   ::Configuration c;
+   CommandLine CmdL(Args, &c);
 
    char const * argv[] = { "test", "--zero", "-t" };
    CmdL.Parse(3 , argv);
-   equals(true, _config->FindB("Test::Worked", false));
-   equals(true, _config->FindB("Test::Zero", false));
+   EXPECT_TRUE(c.FindB("Test::Worked", false));
+   EXPECT_TRUE(c.FindB("Test::Zero", false));
 
-   _config->Clear("Test");
-   equals(false, _config->FindB("Test::Worked", false));
-   equals(false, _config->FindB("Test::Zero", false));
+   c.Clear("Test");
+   EXPECT_FALSE(c.FindB("Test::Worked", false));
+   EXPECT_FALSE(c.FindB("Test::Zero", false));
 
-   _config->Set("Test::Zero", true);
-   equals(true, _config->FindB("Test::Zero", false));
+   c.Set("Test::Zero", true);
+   EXPECT_TRUE(c.FindB("Test::Zero", false));
 
    char const * argv2[] = { "test", "--no-zero", "-t" };
    CmdL.Parse(3 , argv2);
-   equals(true, _config->FindB("Test::Worked", false));
-   equals(false, _config->FindB("Test::Zero", false));
-
-   return 0;
+   EXPECT_TRUE(c.FindB("Test::Worked", false));
+   EXPECT_FALSE(c.FindB("Test::Zero", false));
 }
diff --git a/test/libapt/commandlineasstring_test.cc b/test/libapt/commandlineasstring_test.cc
deleted file mode 100644
index a38957d7e..000000000
--- a/test/libapt/commandlineasstring_test.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <apt-pkg/cmndline.h>
-#include <apt-pkg/configuration.h>
-
-#include <string>
-
-#include "assert.h"
-
-class CLT: public CommandLine {
-
-	public:
-	std::string static AsString(const char * const * const argv,
-				    unsigned int const argc) {
-		std::string const static conf = "Commandline::AsString";
-		_config->Clear(conf);
-		SaveInConfig(argc, argv);
-		return _config->Find(conf);
-	}
-};
-
-#define CMD(y,z) equals(CLT::AsString(argv, y), z);
-
-int main() {
-	{
-		const char* const argv[] = {"apt-get", "install", "-sf"};
-		CMD(3, "apt-get install -sf");
-	}
-	{
-		const char* const argv[] = {"apt-cache", "-s", "apt", "-so", "Debug::test=Test"};
-		CMD(5, "apt-cache -s apt -so Debug::test=Test");
-	}
-	{
-		const char* const argv[] = {"apt-cache", "-s", "apt", "-so", "Debug::test=Das ist ein Test"};
-		CMD(5, "apt-cache -s apt -so Debug::test=\"Das ist ein Test\"");
-	}
-	{
-		const char* const argv[] = {"apt-cache", "-s", "apt", "--hallo", "test=1.0"};
-		CMD(5, "apt-cache -s apt --hallo test=1.0");
-	}
-}
diff --git a/test/libapt/compareversion_test.cc b/test/libapt/compareversion_test.cc
index fdb1d5674..3b2c0c209 100644
--- a/test/libapt/compareversion_test.cc
+++ b/test/libapt/compareversion_test.cc
@@ -16,22 +16,23 @@
    
    ##################################################################### */
 									/*}}}*/
-#include <apt-pkg/macros.h>
+#include <config.h>
+
 #include <apt-pkg/error.h>
-#include <apt-pkg/version.h>
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/fileutl.h>
-#include <iostream>
-#include <fstream>
 
+#include <fstream>
+#include <string>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 
+#include <gtest/gtest.h>
+
 using namespace std;
 
-bool callDPkg(const char *val, const char *ref, const char &op) {
+static bool callDPKG(const char *val, const char *ref, const char &op) {
    pid_t Process = ExecFork();
    if (Process == 0)
    {
@@ -50,77 +51,130 @@ bool callDPkg(const char *val, const char *ref, const char &op) {
    return WIFEXITED(Ret) == true && WEXITSTATUS(Ret) == 0;
 }
 
-void assertVersion(int const &CurLine, string const &A, string const &B, int const &Expected) {
-   int Res = debVS.CmpVersion(A.c_str(), B.c_str());
-   bool const dpkg = callDPkg(A.c_str(),B.c_str(), Expected);
-   Res = (Res < 0) ? -1 : ( (Res > 0) ? 1 : Res);
 
-   if (Res != Expected)
-      _error->Error("Comparison failed on line %u. '%s' '%s' '%s' %i != %i",CurLine,A.c_str(),((Expected == 1) ? "<<" : ( (Expected == 0) ? "=" : ">>")) ,B.c_str(),Res,Expected);
-   if (dpkg == false)
-      _error->Error("DPkg differ with line: %u. '%s' '%s' '%s' == false",CurLine,A.c_str(),((Expected == 1) ? "<<" : ( (Expected == 0) ? "=" : ">>")),B.c_str());
+#define EXPECT_VERSION_PART(A, compare, B) \
+{ \
+   int Res = debVS.CmpVersion(A, B); \
+   Res = (Res < 0) ? -1 : ( (Res > 0) ? 1 : Res); \
+   EXPECT_EQ(compare, Res) << "APT: A: »" << A << "« B: »" << B << "«"; \
+   EXPECT_PRED3(callDPKG, A, B, compare); \
 }
+#define EXPECT_VERSION(A, compare, B) \
+   EXPECT_VERSION_PART(A, compare, B); \
+   EXPECT_VERSION_PART(B, compare * -1, A)
+
+// History-Remark: The versions used to be specified in a versions.lst file
+
+enum CompareVersionType { LESS = -1, GREATER = 1, EQUAL = 0 };
 
-bool RunTest(const char *File)
+TEST(CompareVersionTest,Basic)
 {
-   if (FileExists(File) == false)
-      return _error->Error("Versiontestfile %s doesn't exist!", File);
+   EXPECT_VERSION("7.6p2-4", GREATER, "7.6-0");
+   EXPECT_VERSION("1.0.3-3", GREATER, "1.0-1");
+   EXPECT_VERSION("1.3", GREATER, "1.2.2-2");
+   EXPECT_VERSION("1.3", GREATER, "1.2.2");
 
-   ifstream F(File,ios::in);
-   if (!F != 0)
-      return false;
+   /* disabled as dpkg doesn't like them… (versions have to start with a number)
+   EXPECT_VERSION("-", LESS, ".");
+   EXPECT_VERSION("p", LESS, "-");
+   EXPECT_VERSION("a", LESS, "-");
+   EXPECT_VERSION("z", LESS, "-");
+   EXPECT_VERSION("a", LESS, ".");
+   EXPECT_VERSION("z", LESS, ".");
+   // */
 
-   char Buffer[300];
-   int CurLine = 0;
-   
-   while (1)
-   {
-      F.getline(Buffer,sizeof(Buffer));
-      CurLine++;
-      if (F.eof() != 0)
-	 return true;
-      if (!F != 0)
-	 return _error->Error("Line %u in %s is too long",CurLine,File);
-
-      // Comment
-      if (Buffer[0] == '#' || Buffer[0] == 0)
-	 continue;
-      
-      // First version
-      char *I;
-      char *Start = Buffer;
-      for (I = Buffer; *I != 0 && *I != ' '; I++);
-      string A(Start, I - Start);
-
-      if (*I == 0)
-	 return _error->Error("Invalid line %u",CurLine);
-      
-      // Second version
-      I++;
-      Start = I;
-      for (I = Start; *I != 0 && *I != ' '; I++);
-      string B(Start,I - Start);
-      
-      if (*I == 0 || I[1] == 0)
-	 return _error->Error("Invalid line %u",CurLine);
-      
-      // Result
-      I++;
-      int const Expected = atoi(I);
-      assertVersion(CurLine, A, B, Expected);
-      // Check the reverse as well
-      assertVersion(CurLine, B, A, Expected*-1);
-   }
+   /* disabled as dpkg doesn't like them… (versions have to start with a number)
+   EXPECT_VERSION("III-alpha9.8", LESS, "III-alpha9.8-1.5");
+   // */
+
+   // Test some properties of text strings
+   EXPECT_VERSION("0-pre", EQUAL, "0-pre");
+   EXPECT_VERSION("0-pre", LESS, "0-pree");
+
+   EXPECT_VERSION("1.1.6r2-2", GREATER, "1.1.6r-1");
+   EXPECT_VERSION("2.6b2-1", GREATER, "2.6b-2");
+
+   EXPECT_VERSION("98.1p5-1", LESS, "98.1-pre2-b6-2");
+   EXPECT_VERSION("0.4a6-2", GREATER, "0.4-1");
+
+   EXPECT_VERSION("1:3.0.5-2", LESS, "1:3.0.5.1");
+}
+TEST(CompareVersionTest,Epochs)
+{
+   EXPECT_VERSION("1:0.4", GREATER, "10.3");
+   EXPECT_VERSION("1:1.25-4", LESS, "1:1.25-8");
+   EXPECT_VERSION("0:1.18.36", EQUAL, "1.18.36");
+
+   EXPECT_VERSION("1.18.36", GREATER, "1.18.35");
+   EXPECT_VERSION("0:1.18.36", GREATER, "1.18.35");
 }
+TEST(CompareVersionTest,Strangeness)
+{
+   // Funky, but allowed, characters in upstream version
+   EXPECT_VERSION("9:1.18.36:5.4-20", LESS, "10:0.5.1-22");
+   EXPECT_VERSION("9:1.18.36:5.4-20", LESS, "9:1.18.36:5.5-1");
+   EXPECT_VERSION("9:1.18.36:5.4-20", LESS, " 9:1.18.37:4.3-22");
+   EXPECT_VERSION("1.18.36-0.17.35-18", GREATER, "1.18.36-19");
 
-int main(int argc, char *argv[])
+   // Junk
+   EXPECT_VERSION("1:1.2.13-3", LESS, "1:1.2.13-3.1");
+   EXPECT_VERSION("2.0.7pre1-4", LESS, "2.0.7r-1");
+
+   // if a version includes a dash, it should be the debrev dash - policy says so…
+   EXPECT_VERSION("0:0-0-0", GREATER, "0-0");
+
+   // do we like strange versions? Yes we like strange versions…
+   EXPECT_VERSION("0", EQUAL, "0");
+   EXPECT_VERSION("0", EQUAL, "00");
+}
+TEST(CompareVersionTest,DebianBug)
+{
+   // #205960
+   EXPECT_VERSION("3.0~rc1-1", LESS, "3.0-1");
+   // #573592 - debian policy 5.6.12
+   EXPECT_VERSION("1.0", EQUAL, "1.0-0");
+   EXPECT_VERSION("0.2", LESS, "1.0-0");
+   EXPECT_VERSION("1.0", LESS, "1.0-0+b1");
+   EXPECT_VERSION("1.0", GREATER, "1.0-0~");
+}
+TEST(CompareVersionTest,CuptTests)
 {
-   if (argc != 2)
-      return 1;
-   else
-      RunTest(argv[1]);
-
-   // Print any errors or warnings found
-   _error->DumpErrors();
-   return 0;
+   // "steal" the testcases from (old perl) cupt
+   EXPECT_VERSION("1.2.3", EQUAL, "1.2.3"); // identical
+   EXPECT_VERSION("4.4.3-2", EQUAL, "4.4.3-2"); // identical
+   EXPECT_VERSION("1:2ab:5", EQUAL, "1:2ab:5"); // this is correct...
+   EXPECT_VERSION("7:1-a:b-5", EQUAL, "7:1-a:b-5"); // and this
+   EXPECT_VERSION("57:1.2.3abYZ+~-4-5", EQUAL, "57:1.2.3abYZ+~-4-5"); // and those too
+   EXPECT_VERSION("1.2.3", EQUAL, "0:1.2.3"); // zero epoch
+   EXPECT_VERSION("1.2.3", EQUAL, "1.2.3-0"); // zero revision
+   EXPECT_VERSION("009", EQUAL, "9"); // zeroes…
+   EXPECT_VERSION("009ab5", EQUAL, "9ab5"); // there as well
+   EXPECT_VERSION("1.2.3", LESS, "1.2.3-1"); // added non-zero revision
+   EXPECT_VERSION("1.2.3", LESS, "1.2.4"); // just bigger
+   EXPECT_VERSION("1.2.4", GREATER, "1.2.3"); // order doesn't matter
+   EXPECT_VERSION("1.2.24", GREATER, "1.2.3"); // bigger, eh?
+   EXPECT_VERSION("0.10.0", GREATER, "0.8.7"); // bigger, eh?
+   EXPECT_VERSION("3.2", GREATER, "2.3"); // major number rocks
+   EXPECT_VERSION("1.3.2a", GREATER, "1.3.2"); // letters rock
+   EXPECT_VERSION("0.5.0~git", LESS, "0.5.0~git2"); // numbers rock
+   EXPECT_VERSION("2a", LESS, "21"); // but not in all places
+   EXPECT_VERSION("1.3.2a", LESS, "1.3.2b"); // but there is another letter
+   EXPECT_VERSION("1:1.2.3", GREATER, "1.2.4"); // epoch rocks
+   EXPECT_VERSION("1:1.2.3", LESS, "1:1.2.4"); // bigger anyway
+   EXPECT_VERSION("1.2a+~bCd3", LESS, "1.2a++"); // tilde doesn't rock
+   EXPECT_VERSION("1.2a+~bCd3", GREATER, "1.2a+~"); // but first is longer!
+   EXPECT_VERSION("5:2", GREATER, "304-2"); // epoch rocks
+   EXPECT_VERSION("5:2", LESS, "304:2"); // so big epoch?
+   EXPECT_VERSION("25:2", GREATER, "3:2"); // 25 > 3, obviously
+   EXPECT_VERSION("1:2:123", LESS, "1:12:3"); // 12 > 2
+   EXPECT_VERSION("1.2-5", LESS, "1.2-3-5"); // 1.2 < 1.2-3
+   EXPECT_VERSION("5.10.0", GREATER, "5.005"); // preceding zeroes don't matters
+   EXPECT_VERSION("3a9.8", LESS, "3.10.2"); // letters are before all letter symbols
+   EXPECT_VERSION("3a9.8", GREATER, "3~10"); // but after the tilde
+   EXPECT_VERSION("1.4+OOo3.0.0~", LESS, "1.4+OOo3.0.0-4"); // another tilde check
+   EXPECT_VERSION("2.4.7-1", LESS, "2.4.7-z"); // revision comparing
+   EXPECT_VERSION("1.002-1+b2", GREATER, "1.00"); // whatever...
+   /* disabled as dpkg doesn't like them… (versions with illegal char)
+   EXPECT_VERSION("2.2.4-47978_Debian_lenny", EQUAL, "2.2.4-47978_Debian_lenny"); // and underscore...
+   // */
 }
diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc
index 2c974ee0a..647d8a4af 100644
--- a/test/libapt/configuration_test.cc
+++ b/test/libapt/configuration_test.cc
@@ -1,109 +1,146 @@
+#include <config.h>
+
 #include <apt-pkg/configuration.h>
 
 #include <string>
 #include <vector>
 
-#include "assert.h"
+#include <gtest/gtest.h>
+
+//FIXME: Test for configuration file parsing;
+// currently only integration/ tests test them implicitly
 
-int main(int argc,const char *argv[]) {
+TEST(ConfigurationTest,Lists)
+{
 	Configuration Cnf;
-	std::vector<std::string> fds;
 
 	Cnf.Set("APT::Keep-Fds::",28);
 	Cnf.Set("APT::Keep-Fds::",17);
 	Cnf.Set("APT::Keep-Fds::2",47);
 	Cnf.Set("APT::Keep-Fds::","broken");
-	fds = Cnf.FindVector("APT::Keep-Fds");
-	equals(fds[0], "28");
-	equals(fds[1], "17");
-	equals(fds[2], "47");
-	equals(fds[3], "broken");
-	equals(fds.size(), 4);
-	equals(Cnf.Exists("APT::Keep-Fds::2"), true);
-	equals(Cnf.Find("APT::Keep-Fds::2"), "47");
-	equals(Cnf.FindI("APT::Keep-Fds::2"), 47);
-	equals(Cnf.Exists("APT::Keep-Fds::3"), false);
-	equals(Cnf.Find("APT::Keep-Fds::3"), "");
-	equals(Cnf.FindI("APT::Keep-Fds::3", 56), 56);
-	equals(Cnf.Find("APT::Keep-Fds::3", "not-set"), "not-set");
+	std::vector<std::string> fds = Cnf.FindVector("APT::Keep-Fds");
+	ASSERT_EQ(4, fds.size());
+	EXPECT_EQ("28", fds[0]);
+	EXPECT_EQ("17", fds[1]);
+	EXPECT_EQ("47", fds[2]);
+	EXPECT_EQ("broken", fds[3]);
+
+	EXPECT_TRUE(Cnf.Exists("APT::Keep-Fds::2"));
+	EXPECT_EQ("47", Cnf.Find("APT::Keep-Fds::2"));
+	EXPECT_EQ(47, Cnf.FindI("APT::Keep-Fds::2"));
+	EXPECT_FALSE(Cnf.Exists("APT::Keep-Fds::3"));
+	EXPECT_EQ("", Cnf.Find("APT::Keep-Fds::3"));
+	EXPECT_EQ(56, Cnf.FindI("APT::Keep-Fds::3", 56));
+	EXPECT_EQ("not-set", Cnf.Find("APT::Keep-Fds::3", "not-set"));
 
 	Cnf.Clear("APT::Keep-Fds::2");
+	EXPECT_TRUE(Cnf.Exists("APT::Keep-Fds::2"));
 	fds = Cnf.FindVector("APT::Keep-Fds");
-	equals(fds[0], "28");
-	equals(fds[1], "17");
-	equals(fds[2], "");
-	equals(fds[3], "broken");
-	equals(fds.size(), 4);
-	equals(Cnf.Exists("APT::Keep-Fds::2"), true);
+	ASSERT_EQ(4, fds.size());
+	EXPECT_EQ("28", fds[0]);
+	EXPECT_EQ("17", fds[1]);
+	EXPECT_EQ("", fds[2]);
+	EXPECT_EQ("broken", fds[3]);
 
 	Cnf.Clear("APT::Keep-Fds",28);
 	fds = Cnf.FindVector("APT::Keep-Fds");
-	equals(fds[0], "17");
-	equals(fds[1], "");
-	equals(fds[2], "broken");
-	equals(fds.size(), 3);
+	ASSERT_EQ(3, fds.size());
+	EXPECT_EQ("17", fds[0]);
+	EXPECT_EQ("", fds[1]);
+	EXPECT_EQ("broken", fds[2]);
 
 	Cnf.Clear("APT::Keep-Fds","");
-	equals(Cnf.Exists("APT::Keep-Fds::2"), false);
+	EXPECT_FALSE(Cnf.Exists("APT::Keep-Fds::2"));
 
 	Cnf.Clear("APT::Keep-Fds",17);
 	Cnf.Clear("APT::Keep-Fds","broken");
 	fds = Cnf.FindVector("APT::Keep-Fds");
-	equals(fds.empty(), true);
+	EXPECT_TRUE(fds.empty());
 
 	Cnf.Set("APT::Keep-Fds::",21);
 	Cnf.Set("APT::Keep-Fds::",42);
 	fds = Cnf.FindVector("APT::Keep-Fds");
-	equals(fds[0], "21");
-	equals(fds[1], "42");
-	equals(fds.size(), 2);
+	ASSERT_EQ(2, fds.size());
+	EXPECT_EQ("21", fds[0]);
+	EXPECT_EQ("42", fds[1]);
 
 	Cnf.Clear("APT::Keep-Fds");
 	fds = Cnf.FindVector("APT::Keep-Fds");
-	equals(fds.empty(), true);
+	EXPECT_TRUE(fds.empty());
+}
+TEST(ConfigurationTest,Integers)
+{
+	Configuration Cnf;
 
 	Cnf.CndSet("APT::Version", 42);
 	Cnf.CndSet("APT::Version", "66");
-	equals(Cnf.Find("APT::Version"), "42");
-	equals(Cnf.FindI("APT::Version"), 42);
-	equals(Cnf.Find("APT::Version", "33"), "42");
-	equals(Cnf.FindI("APT::Version", 33), 42);
-	equals(Cnf.Find("APT2::Version", "33"), "33");
-	equals(Cnf.FindI("APT2::Version", 33), 33);
-
-	equals(Cnf.FindFile("Dir::State"), "");
-	equals(Cnf.FindFile("Dir::Aptitude::State"), "");
+	EXPECT_EQ("42", Cnf.Find("APT::Version"));
+	EXPECT_EQ(42, Cnf.FindI("APT::Version"));
+	EXPECT_EQ("42", Cnf.Find("APT::Version", "33"));
+	EXPECT_EQ(42, Cnf.FindI("APT::Version", 33));
+	EXPECT_EQ("33", Cnf.Find("APT2::Version", "33"));
+	EXPECT_EQ(33, Cnf.FindI("APT2::Version", 33));
+}
+TEST(ConfigurationTest,DirsAndFiles)
+{
+	Configuration Cnf;
+
+	EXPECT_EQ("", Cnf.FindFile("Dir::State"));
+	EXPECT_EQ("", Cnf.FindFile("Dir::Aptitude::State"));
 	Cnf.Set("Dir", "/srv/sid");
-	equals(Cnf.FindFile("Dir::State"), "");
+	EXPECT_EQ("", Cnf.FindFile("Dir::State"));
 	Cnf.Set("Dir::State", "var/lib/apt");
 	Cnf.Set("Dir::Aptitude::State", "var/lib/aptitude");
-	equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt");
-	equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude");
+	EXPECT_EQ("/srv/sid/var/lib/apt", Cnf.FindFile("Dir::State"));
+	EXPECT_EQ("/srv/sid/var/lib/aptitude", Cnf.FindFile("Dir::Aptitude::State"));
 
 	Cnf.Set("RootDir", "/");
-	equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt");
-	equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude");
+	EXPECT_EQ("/srv/sid/var/lib/apt", Cnf.FindFile("Dir::State"));
+	EXPECT_EQ("/srv/sid/var/lib/aptitude", Cnf.FindFile("Dir::Aptitude::State"));
 	Cnf.Set("RootDir", "//./////.////");
-	equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt");
-	equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude");
+	EXPECT_EQ("/srv/sid/var/lib/apt", Cnf.FindFile("Dir::State"));
+	EXPECT_EQ("/srv/sid/var/lib/aptitude", Cnf.FindFile("Dir::Aptitude::State"));
 	Cnf.Set("RootDir", "/rootdir");
-	equals(Cnf.FindFile("Dir::State"), "/rootdir/srv/sid/var/lib/apt");
-	equals(Cnf.FindFile("Dir::Aptitude::State"), "/rootdir/srv/sid/var/lib/aptitude");
+	EXPECT_EQ("/rootdir/srv/sid/var/lib/apt", Cnf.FindFile("Dir::State"));
+	EXPECT_EQ("/rootdir/srv/sid/var/lib/aptitude", Cnf.FindFile("Dir::Aptitude::State"));
 	Cnf.Set("RootDir", "/rootdir/");
-	equals(Cnf.FindFile("Dir::State"), "/rootdir/srv/sid/var/lib/apt");
-	equals(Cnf.FindFile("Dir::Aptitude::State"), "/rootdir/srv/sid/var/lib/aptitude");
+	EXPECT_EQ("/rootdir/srv/sid/var/lib/apt", Cnf.FindFile("Dir::State"));
+	EXPECT_EQ("/rootdir/srv/sid/var/lib/aptitude", Cnf.FindFile("Dir::Aptitude::State"));
 
 	Cnf.Set("Dir::State", "/dev/null");
 	Cnf.Set("Dir::State::lists", "lists/");
-	equals(Cnf.FindDir("Dir::State"), "/rootdir/dev/null");
-	equals(Cnf.FindDir("Dir::State::lists"), "/rootdir/dev/null");
-
-        Cnf.Set("Moo::Bar", "1");
-        Cnf.Clear();
-        equals(Cnf.Find("Moo::Bar"), "");
-
-	//FIXME: Test for configuration file parsing;
-	// currently only integration/ tests test them implicitly
+	EXPECT_EQ("/rootdir/dev/null", Cnf.FindDir("Dir::State"));
+	EXPECT_EQ("/rootdir/dev/null", Cnf.FindDir("Dir::State::lists"));
+}
+TEST(ConfigurationTest,Vector)
+{
+	Configuration Cnf;
 
-	return 0;
+	std::vector<std::string> vec = Cnf.FindVector("Test::Vector", "");
+	EXPECT_EQ(0, vec.size());
+	vec = Cnf.FindVector("Test::Vector", "foo");
+	ASSERT_EQ(1, vec.size());
+	EXPECT_EQ("foo", vec[0]);
+	vec = Cnf.FindVector("Test::Vector", "foo,bar");
+	EXPECT_EQ(2, vec.size());
+	EXPECT_EQ("foo", vec[0]);
+	EXPECT_EQ("bar", vec[1]);
+	Cnf.Set("Test::Vector::", "baz");
+	Cnf.Set("Test::Vector::", "bob");
+	Cnf.Set("Test::Vector::", "dob");
+	vec = Cnf.FindVector("Test::Vector");
+	ASSERT_EQ(3, vec.size());
+	EXPECT_EQ("baz", vec[0]);
+	EXPECT_EQ("bob", vec[1]);
+	EXPECT_EQ("dob", vec[2]);
+	vec = Cnf.FindVector("Test::Vector", "foo,bar");
+	ASSERT_EQ(3, vec.size());
+	EXPECT_EQ("baz", vec[0]);
+	EXPECT_EQ("bob", vec[1]);
+	EXPECT_EQ("dob", vec[2]);
+	Cnf.Set("Test::Vector", "abel,bravo");
+	vec = Cnf.FindVector("Test::Vector", "foo,bar");
+	ASSERT_EQ(2, vec.size());
+	EXPECT_EQ("abel", vec[0]);
+	EXPECT_EQ("bravo", vec[1]);
 }
diff --git a/test/libapt/file-helpers.cc b/test/libapt/file-helpers.cc
new file mode 100644
index 000000000..5edb9a9fe
--- /dev/null
+++ b/test/libapt/file-helpers.cc
@@ -0,0 +1,77 @@
+#include <apt-pkg/fileutl.h>
+
+#include <string>
+
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+
+#include <gtest/gtest.h>
+
+#include "file-helpers.h"
+
+void helperCreateTemporaryDirectory(std::string const &id, std::string &dir)
+{
+   std::string const strtempdir = GetTempDir().append("/apt-tests-").append(id).append(".XXXXXX");
+   char * tempdir = strdup(strtempdir.c_str());
+   ASSERT_STREQ(tempdir, mkdtemp(tempdir));
+   dir = tempdir;
+   free(tempdir);
+}
+void helperRemoveDirectory(std::string const &dir)
+{
+   // basic sanity check to avoid removing random directories based on earlier failures
+   if (dir.find("/apt-tests-") == std::string::npos || dir.find_first_of("*?") != std::string::npos)
+      FAIL() << "Directory '" << dir << "' seems invalid. It is therefore not removed!";
+   else
+      ASSERT_EQ(0, system(std::string("rm -rf ").append(dir).c_str()));
+}
+void helperCreateFile(std::string const &dir, std::string const &name)
+{
+   std::string file = dir;
+   file.append("/");
+   file.append(name);
+   int const fd = creat(file.c_str(), 0600);
+   ASSERT_NE(-1, fd);
+   close(fd);
+}
+void helperCreateDirectory(std::string const &dir, std::string const &name)
+{
+   std::string file = dir;
+   file.append("/");
+   file.append(name);
+   ASSERT_TRUE(CreateDirectory(dir, file));
+}
+void helperCreateLink(std::string const &dir, std::string const &targetname, std::string const &linkname)
+{
+   std::string target = dir;
+   target.append("/");
+   target.append(targetname);
+   std::string link = dir;
+   link.append("/");
+   link.append(linkname);
+   ASSERT_EQ(0, symlink(target.c_str(), link.c_str()));
+}
+void helperCreateTemporaryFile(std::string const &id, FileFd &fd, char * * const filename, char const * const content)
+{
+   std::string name("apt-test-");
+   name.append(id).append(".XXXXXXXX");
+   char * tempfile = strdup(name.c_str());
+   int tempfile_fd = mkstemp(tempfile);
+   ASSERT_NE(-1, tempfile_fd);
+   if (filename != NULL)
+      *filename = tempfile;
+   else
+   {
+      unlink(tempfile);
+      free(tempfile);
+   }
+
+   EXPECT_TRUE(fd.OpenDescriptor(tempfile_fd, FileFd::ReadWrite));
+   if (content != NULL)
+   {
+      ASSERT_TRUE(fd.Write(content, strlen(content)));
+      fd.Seek(0);
+   }
+}
diff --git a/test/libapt/file-helpers.h b/test/libapt/file-helpers.h
new file mode 100644
index 000000000..e8472d503
--- /dev/null
+++ b/test/libapt/file-helpers.h
@@ -0,0 +1,29 @@
+#ifndef APT_TESTS_FILE_HELPERS
+#define APT_TESTS_FILE_HELPERS
+
+#include <string>
+
+#include <gtest/gtest.h>
+
+class FileFd;
+
+#define createTemporaryDirectory(id, dir) \
+   ASSERT_NO_FATAL_FAILURE(helperCreateTemporaryDirectory(id, dir))
+void helperCreateTemporaryDirectory(std::string const &id, std::string &dir);
+#define removeDirectory(dir) \
+   ASSERT_NO_FATAL_FAILURE(helperRemoveDirectory(dir))
+void helperRemoveDirectory(std::string const &dir);
+#define createFile(dir, name) \
+   ASSERT_NO_FATAL_FAILURE(helperCreateFile(dir, name))
+void helperCreateFile(std::string const &dir, std::string const &name);
+#define createDirectory(dir, name) \
+   ASSERT_NO_FATAL_FAILURE(helperCreateDirectory(dir, name))
+void helperCreateDirectory(std::string const &dir, std::string const &name);
+#define createLink(dir, targetname, linkname) \
+   ASSERT_NO_FATAL_FAILURE(helperCreateLink(dir, targetname, linkname))
+void helperCreateLink(std::string const &dir, std::string const &targetname, std::string const &linkname);
+#define createTemporaryFile(id, fd, filename, content) \
+   ASSERT_NO_FATAL_FAILURE(helperCreateTemporaryFile(id, fd, filename, content))
+void helperCreateTemporaryFile(std::string const &id, FileFd &fd, char * * const filename, char const * const content);
+
+#endif
diff --git a/test/libapt/fileutl_test.cc b/test/libapt/fileutl_test.cc
index 462bdefd9..643c02297 100644
--- a/test/libapt/fileutl_test.cc
+++ b/test/libapt/fileutl_test.cc
@@ -1,55 +1,226 @@
+#include <config.h>
+
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/aptconfiguration.h>
 
-#include "assert.h"
 #include <string>
 #include <vector>
-
-#include <stdio.h>
-#include <iostream>
 #include <stdlib.h>
+#include <string.h>
+
+#include <gtest/gtest.h>
 
+#include "file-helpers.h"
 
-int main(int argc,char *argv[])
+static void TestFileFd(mode_t const a_umask, mode_t const ExpectedFilePermission,
+      unsigned int const filemode, APT::Configuration::Compressor const &compressor)
 {
-   std::vector<std::string> files;
+   std::string trace;
+   strprintf(trace, "TestFileFd: Compressor: %s umask: %#o permission: %#o mode: %d", compressor.Name.c_str(), a_umask, ExpectedFilePermission, filemode);
+   SCOPED_TRACE(trace);
 
-   // normal match
-   files = Glob("*.lst");
-   if (files.size() != 1)
+   static const char* fname = "apt-filefd-test.txt";
+   if (FileExists(fname) == true)
+      EXPECT_EQ(0, unlink(fname));
+
+   FileFd f;
+   umask(a_umask);
+   EXPECT_TRUE(f.Open(fname, filemode, compressor));
+   EXPECT_TRUE(f.IsOpen());
+   EXPECT_FALSE(f.Failed());
+   EXPECT_EQ(umask(a_umask), a_umask);
+
+   std::string test = "This is a test!\n";
+   EXPECT_TRUE(f.Write(test.c_str(), test.size()));
+   EXPECT_TRUE(f.IsOpen());
+   EXPECT_FALSE(f.Failed());
+
+   f.Close();
+   EXPECT_FALSE(f.IsOpen());
+   EXPECT_FALSE(f.Failed());
+
+   EXPECT_TRUE(f.Open(fname, FileFd::ReadOnly, compressor));
+   EXPECT_TRUE(f.IsOpen());
+   EXPECT_FALSE(f.Failed());
+   EXPECT_FALSE(f.Eof());
+   EXPECT_NE(0, f.FileSize());
+   EXPECT_FALSE(f.Failed());
+   EXPECT_NE(0, f.ModificationTime());
+   EXPECT_FALSE(f.Failed());
+
+   // ensure the memory is as predictably messed up
+#define APT_INIT_READBACK \
+   char readback[20]; \
+   memset(readback, 'D', sizeof(readback)/sizeof(readback[0])); \
+   readback[19] = '\0';
+#define EXPECT_N_STR(expect, actual) \
+   EXPECT_EQ(0, strncmp(expect, actual, strlen(expect)));
+
+   {
+      APT_INIT_READBACK
+      char const * const expect = "This";
+      EXPECT_TRUE(f.Read(readback, strlen(expect)));
+      EXPECT_FALSE(f.Failed());
+      EXPECT_FALSE(f.Eof());
+      EXPECT_N_STR(expect, readback);
+      EXPECT_EQ(strlen(expect), f.Tell());
+   }
+   {
+      APT_INIT_READBACK
+      char const * const expect = "test!\n";
+      EXPECT_TRUE(f.Skip((test.size() - f.Tell()) - strlen(expect)));
+      EXPECT_TRUE(f.Read(readback, strlen(expect)));
+      EXPECT_FALSE(f.Failed());
+      EXPECT_FALSE(f.Eof());
+      EXPECT_N_STR(expect, readback);
+      EXPECT_EQ(test.size(), f.Tell());
+   }
+   {
+      APT_INIT_READBACK
+      EXPECT_TRUE(f.Seek(0));
+      EXPECT_FALSE(f.Eof());
+      EXPECT_TRUE(f.Read(readback, 20, true));
+      EXPECT_FALSE(f.Failed());
+      EXPECT_TRUE(f.Eof());
+      EXPECT_N_STR(test.c_str(), readback);
+      EXPECT_EQ(f.Size(), f.Tell());
+   }
+   {
+      APT_INIT_READBACK
+      EXPECT_TRUE(f.Seek(0));
+      EXPECT_FALSE(f.Eof());
+      EXPECT_TRUE(f.Read(readback, test.size(), true));
+      EXPECT_FALSE(f.Failed());
+      EXPECT_FALSE(f.Eof());
+      EXPECT_N_STR(test.c_str(), readback);
+      EXPECT_EQ(f.Size(), f.Tell());
+   }
+   {
+      APT_INIT_READBACK
+      EXPECT_TRUE(f.Seek(0));
+      EXPECT_FALSE(f.Eof());
+      unsigned long long actual;
+      EXPECT_TRUE(f.Read(readback, 20, &actual));
+      EXPECT_FALSE(f.Failed());
+      EXPECT_TRUE(f.Eof());
+      EXPECT_EQ(test.size(), actual);
+      EXPECT_N_STR(test.c_str(), readback);
+      EXPECT_EQ(f.Size(), f.Tell());
+   }
    {
-      _error->DumpErrors();
-      return 1;
+      APT_INIT_READBACK
+      EXPECT_TRUE(f.Seek(0));
+      EXPECT_FALSE(f.Eof());
+      f.ReadLine(readback, 20);
+      EXPECT_FALSE(f.Failed());
+      EXPECT_FALSE(f.Eof());
+      EXPECT_EQ(test, readback);
+      EXPECT_EQ(f.Size(), f.Tell());
    }
+   {
+      APT_INIT_READBACK
+      EXPECT_TRUE(f.Seek(0));
+      EXPECT_FALSE(f.Eof());
+      char const * const expect = "This";
+      f.ReadLine(readback, strlen(expect) + 1);
+      EXPECT_FALSE(f.Failed());
+      EXPECT_FALSE(f.Eof());
+      EXPECT_N_STR(expect, readback);
+      EXPECT_EQ(strlen(expect), f.Tell());
+   }
+#undef APT_INIT_READBACK
 
-   // not there
-   files = Glob("xxxyyyzzz");
-   if (files.size() != 0 || _error->PendingError())
+   f.Close();
+   EXPECT_FALSE(f.IsOpen());
+   EXPECT_FALSE(f.Failed());
+
+   // regression test for permission bug LP: #1304657
+   struct stat buf;
+   EXPECT_EQ(0, stat(fname, &buf));
+   EXPECT_EQ(0, unlink(fname));
+   EXPECT_EQ(ExpectedFilePermission, buf.st_mode & 0777);
+}
+
+static void TestFileFd(unsigned int const filemode)
+{
+   std::vector<APT::Configuration::Compressor> compressors = APT::Configuration::getCompressors();
+
+   // testing the (un)compress via pipe, as the 'real' compressors are usually built in via libraries
+   compressors.push_back(APT::Configuration::Compressor("rev", ".reversed", "rev", NULL, NULL, 42));
+   //compressors.push_back(APT::Configuration::Compressor("cat", ".ident", "cat", NULL, NULL, 42));
+
+   for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin(); c != compressors.end(); ++c)
    {
-      _error->DumpErrors();
-      return 1;
+      if ((filemode & FileFd::ReadWrite) == FileFd::ReadWrite &&
+	    (c->Name.empty() != true && c->Binary.empty() != true))
+	 continue;
+      TestFileFd(0002, 0664, filemode, *c);
+      TestFileFd(0022, 0644, filemode, *c);
+      TestFileFd(0077, 0600, filemode, *c);
+      TestFileFd(0026, 0640, filemode, *c);
    }
+}
+
+TEST(FileUtlTest, FileFD)
+{
+   std::string const startdir = SafeGetCWD();
+   EXPECT_FALSE(startdir.empty());
+   std::string tempdir;
+   createTemporaryDirectory("filefd", tempdir);
+   EXPECT_EQ(0, chdir(tempdir.c_str()));
+
+   TestFileFd(FileFd::WriteOnly | FileFd::Create);
+   TestFileFd(FileFd::WriteOnly | FileFd::Create | FileFd::Empty);
+   TestFileFd(FileFd::WriteOnly | FileFd::Create | FileFd::Exclusive);
+   TestFileFd(FileFd::WriteOnly | FileFd::Atomic);
+   TestFileFd(FileFd::WriteOnly | FileFd::Create | FileFd::Atomic);
+   // short-hands for ReadWrite with these modes
+   TestFileFd(FileFd::WriteEmpty);
+   TestFileFd(FileFd::WriteAny);
+   TestFileFd(FileFd::WriteTemp);
+   TestFileFd(FileFd::WriteAtomic);
+
+   EXPECT_EQ(0, chdir(startdir.c_str()));
+   removeDirectory(tempdir);
+}
+TEST(FileUtlTest, Glob)
+{
+   std::vector<std::string> files;
+   // normal match
+   files = Glob("*akefile");
+   EXPECT_EQ(1, files.size());
+
+   // not there
+   files = Glob("xxxyyyzzz");
+   EXPECT_TRUE(files.empty());
+   EXPECT_FALSE(_error->PendingError());
 
    // many matches (number is a bit random)
    files = Glob("*.cc");
-   if (files.size() < 10)
-   {
-      _error->DumpErrors();
-      return 1;
-   }
+   EXPECT_LT(10, files.size());
+}
+TEST(FileUtlTest, GetTempDir)
+{
+   char const * const envtmp = getenv("TMPDIR");
+   std::string old_tmpdir;
+   if (envtmp != NULL)
+      old_tmpdir = envtmp;
 
-   // GetTempDir()
    unsetenv("TMPDIR");
-   equals(GetTempDir(), "/tmp");
+   EXPECT_EQ("/tmp", GetTempDir());
 
    setenv("TMPDIR", "", 1);
-   equals(GetTempDir(), "/tmp");
+   EXPECT_EQ("/tmp", GetTempDir());
 
    setenv("TMPDIR", "/not-there-no-really-not", 1);
-   equals(GetTempDir(), "/tmp");
+   EXPECT_EQ("/tmp", GetTempDir());
 
    setenv("TMPDIR", "/usr", 1);
-   equals(GetTempDir(), "/usr");
+   EXPECT_EQ("/usr", GetTempDir());
 
-   return 0;
+   unsetenv("TMPDIR");
+   if (old_tmpdir.empty() == false)
+      setenv("TMPDIR", old_tmpdir.c_str(), 1);
 }
diff --git a/test/libapt/getarchitectures_test.cc b/test/libapt/getarchitectures_test.cc
index 807469263..53c00cd8f 100644
--- a/test/libapt/getarchitectures_test.cc
+++ b/test/libapt/getarchitectures_test.cc
@@ -1,60 +1,77 @@
+#include <config.h>
+
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
 
-#include "assert.h"
 #include <string>
 #include <vector>
 
-#include <iostream>
+#include <gtest/gtest.h>
 
-int main(int argc,char *argv[])
+TEST(ArchitecturesTest,SimpleLists)
 {
-	std::vector<std::string> vec;
-
-	_config->Set("APT::Architectures::1", "i386");
-	_config->Set("APT::Architectures::2", "amd64");
-	vec = APT::Configuration::getArchitectures(false);
-	equals(vec.size(), 2);
-	equals(vec[0], "i386");
-	equals(vec[1], "amd64");
-
-	_config->Set("APT::Architecture", "i386");
-	vec = APT::Configuration::getArchitectures(false);
-	equals(vec.size(), 2);
-	equals(vec[0], "i386");
-	equals(vec[1], "amd64");
-
-	_config->Set("APT::Architectures::2", "");
-	vec = APT::Configuration::getArchitectures(false);
-	equals(vec.size(), 1);
-	equals(vec[0], "i386");
-
-	_config->Set("APT::Architecture", "armel");
-	vec = APT::Configuration::getArchitectures(false);
-	equals(vec.size(), 2);
-	equals(vec[0], "armel");
-	equals(vec[1], "i386");
-
-	_config->Set("APT::Architectures::2", "armel");
-	vec = APT::Configuration::getArchitectures(false);
-	equals(vec.size(), 2);
-	equals(vec[0], "i386");
-	equals(vec[1], "armel");
-
-	_config->Set("APT::Architectures::2", "amd64");
-	_config->Set("APT::Architectures::3", "i386");
-	_config->Set("APT::Architectures::4", "armel");
-	_config->Set("APT::Architectures::5", "i386");
-	_config->Set("APT::Architectures::6", "amd64");
-	_config->Set("APT::Architectures::7", "armel");
-	_config->Set("APT::Architectures::8", "armel");
-	_config->Set("APT::Architectures::9", "amd64");
-	_config->Set("APT::Architectures::10", "amd64");
-	vec = APT::Configuration::getArchitectures(false);
-	equals(vec.size(), 3);
-	equals(vec[0], "i386");
-	equals(vec[1], "amd64");
-	equals(vec[2], "armel");
-
-	return 0;
+   _config->Clear();
+   std::vector<std::string> vec;
+
+   _config->Set("APT::Architectures::1", "i386");
+   _config->Set("APT::Architectures::2", "amd64");
+   vec = APT::Configuration::getArchitectures(false);
+   ASSERT_EQ(2, vec.size());
+   EXPECT_EQ("i386", vec[0]);
+   EXPECT_EQ("amd64", vec[1]);
+
+   _config->Set("APT::Architecture", "i386");
+   vec = APT::Configuration::getArchitectures(false);
+   ASSERT_EQ(2, vec.size());
+   EXPECT_EQ("i386", vec[0]);
+   EXPECT_EQ("amd64", vec[1]);
+
+   _config->Set("APT::Architectures::2", "");
+   vec = APT::Configuration::getArchitectures(false);
+   ASSERT_EQ(1, vec.size());
+   EXPECT_EQ("i386", vec[0]);
+
+   _config->Set("APT::Architecture", "armel");
+   vec = APT::Configuration::getArchitectures(false);
+   ASSERT_EQ(2, vec.size());
+   EXPECT_EQ("armel", vec[0]);
+   EXPECT_EQ("i386", vec[1]);
+
+   _config->Set("APT::Architectures::2", "armel");
+   vec = APT::Configuration::getArchitectures(false);
+   ASSERT_EQ(2, vec.size());
+   EXPECT_EQ("i386", vec[0]);
+   EXPECT_EQ("armel", vec[1]);
+
+   _config->Set("APT::Architectures", "armel,armhf");
+   vec = APT::Configuration::getArchitectures(false);
+   ASSERT_EQ(2, vec.size());
+   EXPECT_EQ("armel", vec[0]);
+   EXPECT_EQ("armhf", vec[1]);
+   _config->Clear();
+}
+TEST(ArchitecturesTest,Duplicates)
+{
+   _config->Clear();
+
+   _config->Set("APT::Architecture", "armel");
+   _config->Set("APT::Architectures::", "i386");
+   _config->Set("APT::Architectures::", "amd64");
+   _config->Set("APT::Architectures::", "i386");
+   _config->Set("APT::Architectures::", "armel");
+   _config->Set("APT::Architectures::", "i386");
+   _config->Set("APT::Architectures::", "amd64");
+   _config->Set("APT::Architectures::", "armel");
+   _config->Set("APT::Architectures::", "armel");
+   _config->Set("APT::Architectures::", "amd64");
+   _config->Set("APT::Architectures::", "amd64");
+   std::vector<std::string> vec = _config->FindVector("APT::Architectures");
+   ASSERT_EQ(10, vec.size());
+   vec = APT::Configuration::getArchitectures(false);
+   ASSERT_EQ(3, vec.size());
+   EXPECT_EQ("i386", vec[0]);
+   EXPECT_EQ("amd64", vec[1]);
+   EXPECT_EQ("armel", vec[2]);
+
+   _config->Clear();
 }
diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc
index cef89bde6..c50ff6ff8 100644
--- a/test/libapt/getlanguages_test.cc
+++ b/test/libapt/getlanguages_test.cc
@@ -1,190 +1,234 @@
+#include <config.h>
+
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/fileutl.h>
 
-#include "assert.h"
+#include <algorithm>
+#include <iostream>
 #include <string>
 #include <vector>
 
-#include <iostream>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <gtest/gtest.h>
+
+#include "file-helpers.h"
+
+TEST(LanguagesTest,Environment)
+{
+   _config->Clear();
+
+   char const* env[2];
+   env[0] = "de_DE.UTF-8";
+   env[1] = "";
+
+   std::vector<std::string> vec = APT::Configuration::getLanguages(false, false, env);
+   ASSERT_EQ(3 ,vec.size());
+   EXPECT_EQ("de_DE", vec[0]);
+   EXPECT_EQ("de", vec[1]);
+   EXPECT_EQ("en", vec[2]);
+
+   // Special: Check if the cache is actually in use
+   env[0] = "en_GB.UTF-8";
+   vec = APT::Configuration::getLanguages(false, true, env);
+   ASSERT_EQ(3, vec.size());
+   EXPECT_EQ("de_DE", vec[0]);
+   EXPECT_EQ("de", vec[1]);
+   EXPECT_EQ("en", vec[2]);
+
+   env[0] = "en_GB.UTF-8";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   ASSERT_EQ(2, vec.size());
+   EXPECT_EQ("en_GB", vec[0]);
+   EXPECT_EQ("en", vec[1]);
+
+   // esperanto
+   env[0] = "eo.UTF-8";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   ASSERT_EQ(2, vec.size());
+   EXPECT_EQ("eo", vec[0]);
+   EXPECT_EQ("en", vec[1]);
+
+   env[0] = "tr_DE@euro";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_EQ(3, vec.size());
+   EXPECT_EQ("tr_DE", vec[0]);
+   EXPECT_EQ("tr", vec[1]);
+   EXPECT_EQ("en", vec[2]);
+
+   env[0] = "de_NO";
+   env[1] = "de_NO:en_GB:nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_EQ(6, vec.size());
+   EXPECT_EQ("de_NO", vec[0]);
+   EXPECT_EQ("de", vec[1]);
+   EXPECT_EQ("en_GB", vec[2]);
+   EXPECT_EQ("nb_NO", vec[3]);
+   EXPECT_EQ("nb", vec[4]);
+   EXPECT_EQ("en", vec[5]);
+
+   env[0] = "pt_PR.UTF-8";
+   env[1] = "";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_EQ(3, vec.size());
+   EXPECT_EQ("pt_PR", vec[0]);
+   EXPECT_EQ("pt", vec[1]);
+   EXPECT_EQ("en", vec[2]);
+
+   env[0] = "ast_DE.UTF-8";
+   vec = APT::Configuration::getLanguages(false, false, env); // bogus, but syntactical correct
+   EXPECT_EQ(3, vec.size());
+   EXPECT_EQ("ast_DE", vec[0]);
+   EXPECT_EQ("ast", vec[1]);
+   EXPECT_EQ("en", vec[2]);
+
+   env[0] = "C";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_EQ(1, vec.size());
+   EXPECT_EQ("en", vec[0]);
+
+   _config->Set("Acquire::Languages", "none");
+   env[0] = "C";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_TRUE(vec.empty());
+
+   _config->Set("Acquire::Languages", "environment");
+   env[0] = "C";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_EQ(1, vec.size());
+   EXPECT_EQ("en", vec[0]);
+
+   _config->Set("Acquire::Languages", "de");
+   env[0] = "C";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_EQ(1, vec.size());
+   EXPECT_EQ("de", vec[0]);
+
+   _config->Set("Acquire::Languages", "fr");
+   env[0] = "ast_DE.UTF-8";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_EQ(1, vec.size());
+   EXPECT_EQ("fr", vec[0]);
+
+   _config->Set("Acquire::Languages", "environment,en");
+   env[0] = "de_DE.UTF-8";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_EQ(3, vec.size());
+   EXPECT_EQ("de_DE", vec[0]);
+   EXPECT_EQ("de", vec[1]);
+   EXPECT_EQ("en", vec[2]);
+   _config->Set("Acquire::Languages", "");
+
+   _config->Set("Acquire::Languages::1", "environment");
+   _config->Set("Acquire::Languages::2", "en");
+   env[0] = "de_DE.UTF-8";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_EQ(3, vec.size());
+   EXPECT_EQ("de_DE", vec[0]);
+   EXPECT_EQ("de", vec[1]);
+   EXPECT_EQ("en", vec[2]);
+
+   _config->Set("Acquire::Languages::3", "de");
+   env[0] = "de_DE.UTF-8";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_EQ(3, vec.size());
+   EXPECT_EQ("de_DE", vec[0]);
+   EXPECT_EQ("de", vec[1]);
+   EXPECT_EQ("en", vec[2]);
+
+   _config->Clear();
+}
 
-int main(int argc,char *argv[])
+TEST(LanguagesTest,TranslationFiles)
 {
-	if (argc != 2) {
-		std::cout << "One parameter expected - given " << argc << std::endl;
-		return 100;
-	}
-
-	char const* env[2];
-	env[0] = "de_DE.UTF-8";
-	env[1] = "";
-
-	std::vector<std::string> vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 3);
-	equals(vec[0], "de_DE");
-	equals(vec[1], "de");
-	equals(vec[2], "en");
-
-	// Special: Check if the cache is actually in use
-		env[0] = "en_GB.UTF-8";
-		vec = APT::Configuration::getLanguages(false, true, env);
-		equals(vec.size(), 3);
-		equals(vec[0], "de_DE");
-		equals(vec[1], "de");
-		equals(vec[2], "en");
-
-	env[0] = "en_GB.UTF-8";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 2);
-	equals(vec[0], "en_GB");
-	equals(vec[1], "en");
-
-	// esperanto
-	env[0] = "eo.UTF-8";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 2);
-	equals(vec[0], "eo");
-	equals(vec[1], "en");
-
-	env[0] = "tr_DE@euro";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 3);
-	equals(vec[0], "tr_DE");
-	equals(vec[1], "tr");
-	equals(vec[2], "en");
-
-	env[0] = "de_NO";
-	env[1] = "de_NO:en_GB:nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 6);
-	equals(vec[0], "de_NO");
-	equals(vec[1], "de");
-	equals(vec[2], "en_GB");
-	equals(vec[3], "nb_NO");
-	equals(vec[4], "nb");
-	equals(vec[5], "en");
-
-	env[0] = "pt_PR.UTF-8";
-	env[1] = "";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 3);
-	equals(vec[0], "pt_PR");
-	equals(vec[1], "pt");
-	equals(vec[2], "en");
-
-	env[0] = "ast_DE.UTF-8";
-	vec = APT::Configuration::getLanguages(false, false, env); // bogus, but syntactical correct
-	equals(vec.size(), 3);
-	equals(vec[0], "ast_DE");
-	equals(vec[1], "ast");
-	equals(vec[2], "en");
-
-	env[0] = "C";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 1);
-	equals(vec[0], "en");
-
-	_config->Set("Acquire::Languages", "none");
-	env[0] = "C";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 0);
-
-	_config->Set("Acquire::Languages", "environment");
-	env[0] = "C";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 1);
-	equals(vec[0], "en");
-
-	_config->Set("Acquire::Languages", "de");
-	env[0] = "C";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 1);
-	equals(vec[0], "de");
-
-	_config->Set("Acquire::Languages", "fr");
-	env[0] = "ast_DE.UTF-8";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 1);
-	equals(vec[0], "fr");
-	_config->Set("Acquire::Languages", "");
-
-	_config->Set("Acquire::Languages::1", "environment");
-	_config->Set("Acquire::Languages::2", "en");
-	env[0] = "de_DE.UTF-8";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 3);
-	equals(vec[0], "de_DE");
-	equals(vec[1], "de");
-	equals(vec[2], "en");
-
-	_config->Set("Acquire::Languages::3", "de");
-	env[0] = "de_DE.UTF-8";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 3);
-	equals(vec[0], "de_DE");
-	equals(vec[1], "de");
-	equals(vec[2], "en");
-
-	_config->Set("Dir::State::lists", argv[1]);
-	vec = APT::Configuration::getLanguages(true, false, env);
-	equals(vec.size(), 8);
-	equals(vec[0], "de_DE");
-	equals(vec[1], "de");
-	equals(vec[2], "en");
-	equals(vec[3], "none");
-	equalsOr4(vec[4], "pt", "tr", "ast_DE", "tlh_DE");
-	equalsOr4(vec[5], "tr", "pt", "ast_DE", "tlh_DE");
-	equalsOr4(vec[6], "tr", "pt", "ast_DE", "tlh_DE");
-	equalsOr4(vec[7], "tr", "pt", "ast_DE", "tlh_DE");
-	equalsNot(vec[4], vec[5]);
-	equalsNot(vec[4], vec[6]);
-	equalsNot(vec[4], vec[7]);
-	equalsNot(vec[5], vec[6]);
-	equalsNot(vec[5], vec[7]);
-	equalsNot(vec[6], vec[7]);
-
-	_config->Set("Acquire::Languages", "none");
-	vec = APT::Configuration::getLanguages(true, false, env);
-	equals(vec.size(), 1);
-	equals(vec[0], "none");
-	_config->Set("Acquire::Languages", "");
-
-	_config->Set("Dir::State::lists", "/non-existing-dir");
-	_config->Set("Acquire::Languages::1", "none");
-	env[0] = "de_DE.UTF-8";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 0);
-	env[0] = "de_DE.UTF-8";
-	vec = APT::Configuration::getLanguages(true, false, env);
-	equals(vec.size(), 2);
-	equals(vec[0], "en");
-	equals(vec[1], "de");
-
-	_config->Set("Acquire::Languages::1", "fr");
-	_config->Set("Acquire::Languages", "de_DE");
-	env[0] = "de_DE.UTF-8";
-	vec = APT::Configuration::getLanguages(false, false, env);
-	equals(vec.size(), 1);
-	equals(vec[0], "de_DE");
-
-	_config->Set("Acquire::Languages", "none");
-	env[0] = "de_DE.UTF-8";
-	vec = APT::Configuration::getLanguages(true, false, env);
-	equals(vec.size(), 1);
-	equals(vec[0], "none");
-
-	_config->Set("Acquire::Languages", "");
-	//FIXME: Remove support for this deprecated setting
-		_config->Set("APT::Acquire::Translation", "ast_DE");
-		env[0] = "de_DE.UTF-8";
-		vec = APT::Configuration::getLanguages(true, false, env);
-		equals(vec.size(), 2);
-		equals(vec[0], "ast_DE");
-		equals(vec[1], "en");
-		_config->Set("APT::Acquire::Translation", "none");
-		env[0] = "de_DE.UTF-8";
-		vec = APT::Configuration::getLanguages(true, false, env);
-		equals(vec.size(), 1);
-		equals(vec[0], "en");
-
-	return 0;
+   _config->Clear();
+   _config->Set("Acquire::Languages::1", "environment");
+   _config->Set("Acquire::Languages::2", "en");
+   _config->Set("Acquire::Languages::3", "de");
+
+   char const* env[2];
+   env[0] = "de_DE.UTF-8";
+   env[1] = "";
+
+   std::string tempdir;
+   createTemporaryDirectory("languages", tempdir);
+
+#define createTranslation(lang) \
+   createFile(tempdir, std::string("/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-").append(lang));
+
+   createTranslation("tr");
+   createTranslation("pt");
+   createTranslation("se~");
+   createTranslation("st.bak");
+   createTranslation("ast_DE");
+   createTranslation("tlh%5fDE");
+
+   _config->Set("Dir::State::lists", tempdir);
+   std::vector<std::string> vec = APT::Configuration::getLanguages(true, false, env);
+   EXPECT_EQ(8, vec.size());
+   EXPECT_EQ("de_DE", vec[0]);
+   EXPECT_EQ("de", vec[1]);
+   EXPECT_EQ("en", vec[2]);
+   EXPECT_EQ("none", vec[3]);
+   EXPECT_NE(vec.end(), std::find(vec.begin(), vec.end(), "pt"));
+   EXPECT_NE(vec.end(), std::find(vec.begin(), vec.end(), "tr"));
+   EXPECT_NE(vec.end(), std::find(vec.begin(), vec.end(), "ast_DE"));
+   EXPECT_NE(vec.end(), std::find(vec.begin(), vec.end(), "tlh_DE"));
+   EXPECT_NE(vec[4], vec[5]);
+   EXPECT_NE(vec[4], vec[6]);
+   EXPECT_NE(vec[4], vec[7]);
+   EXPECT_NE(vec[5], vec[6]);
+   EXPECT_NE(vec[5], vec[7]);
+   EXPECT_NE(vec[6], vec[7]);
+
+   _config->Set("Acquire::Languages", "none");
+   vec = APT::Configuration::getLanguages(true, false, env);
+   EXPECT_EQ(1, vec.size());
+   EXPECT_EQ("none", vec[0]);
+   _config->Set("Acquire::Languages", "");
+
+   _config->Set("Dir::State::lists", "/non-existing-dir");
+   _config->Set("Acquire::Languages::1", "none");
+   env[0] = "de_DE.UTF-8";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_TRUE(vec.empty());
+   env[0] = "de_DE.UTF-8";
+   vec = APT::Configuration::getLanguages(true, false, env);
+   EXPECT_EQ(2, vec.size());
+   EXPECT_EQ("en", vec[0]);
+   EXPECT_EQ("de", vec[1]);
+
+   _config->Set("Acquire::Languages::1", "fr");
+   _config->Set("Acquire::Languages", "de_DE");
+   env[0] = "de_DE.UTF-8";
+   vec = APT::Configuration::getLanguages(false, false, env);
+   EXPECT_EQ(1, vec.size());
+   EXPECT_EQ("de_DE", vec[0]);
+
+   _config->Set("Acquire::Languages", "none");
+   env[0] = "de_DE.UTF-8";
+   vec = APT::Configuration::getLanguages(true, false, env);
+   EXPECT_EQ(1, vec.size());
+   EXPECT_EQ("none", vec[0]);
+
+   _config->Set("Acquire::Languages", "");
+   //FIXME: Remove support for this deprecated setting
+   _config->Set("APT::Acquire::Translation", "ast_DE");
+   env[0] = "de_DE.UTF-8";
+   vec = APT::Configuration::getLanguages(true, false, env);
+   EXPECT_EQ(2, vec.size());
+   EXPECT_EQ("ast_DE", vec[0]);
+   EXPECT_EQ("en", vec[1]);
+   _config->Set("APT::Acquire::Translation", "none");
+   env[0] = "de_DE.UTF-8";
+   vec = APT::Configuration::getLanguages(true, false, env);
+   EXPECT_EQ(1, vec.size());
+   EXPECT_EQ("en", vec[0]);
+
+
+   EXPECT_EQ(0, system(std::string("rm -rf ").append(tempdir).c_str()));
+   _config->Clear();
 }
diff --git a/test/libapt/getlistoffilesindir_test.cc b/test/libapt/getlistoffilesindir_test.cc
index b2c95e840..2369c911a 100644
--- a/test/libapt/getlistoffilesindir_test.cc
+++ b/test/libapt/getlistoffilesindir_test.cc
@@ -1,75 +1,107 @@
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 
-#include "assert.h"
 #include <string>
 #include <vector>
-
-#include <stdio.h>
 #include <iostream>
 
-#define P(x)	std::string(argv[1]).append("/").append(x)
+#include <gtest/gtest.h>
+
+#include "file-helpers.h"
+
+#define P(x)	std::string(tempdir).append("/").append(x)
 
-int main(int argc,char *argv[])
+TEST(FileUtlTest,GetListOfFilesInDir)
 {
-	if (argc != 2) {
-		std::cout << "One parameter expected - given " << argc << std::endl;
-		return 100;
-	}
-
-	// Files with no extension
-	std::vector<std::string> files = GetListOfFilesInDir(argv[1], "", true);
-	equals(files.size(), 2);
-	equals(files[0], P("01yet-anothernormalfile"));
-	equals(files[1], P("anormalfile"));
-
-	// Files with no extension - should be the same as above
-	files = GetListOfFilesInDir(argv[1], "", true, true);
-	equals(files.size(), 2);
-	equals(files[0], P("01yet-anothernormalfile"));
-	equals(files[1], P("anormalfile"));
-
-	// Files with impossible extension
-	files = GetListOfFilesInDir(argv[1], "impossible", true);
-	equals(files.size(), 0);
-
-	// Files with impossible or no extension
-	files = GetListOfFilesInDir(argv[1], "impossible", true, true);
-	equals(files.size(), 2);
-	equals(files[0], P("01yet-anothernormalfile"));
-	equals(files[1], P("anormalfile"));
-
-	// Files with list extension - nothing more
-	files = GetListOfFilesInDir(argv[1], "list", true);
-	equals(files.size(), 4);
-	equals(files[0], P("01yet-anotherapt.list"));
-	equals(files[1], P("anormalapt.list"));
-	equals(files[2], P("linkedfile.list"));
-	equals(files[3], P("multi.dot.list"));
-
-	// Files with conf or no extension
-	files = GetListOfFilesInDir(argv[1], "conf", true, true);
-	equals(files.size(), 5);
-	equals(files[0], P("01yet-anotherapt.conf"));
-	equals(files[1], P("01yet-anothernormalfile"));
-	equals(files[2], P("anormalapt.conf"));
-	equals(files[3], P("anormalfile"));
-	equals(files[4], P("multi.dot.conf"));
-
-	// Files with disabled extension - nothing more
-	files = GetListOfFilesInDir(argv[1], "disabled", true);
-	equals(files.size(), 3);
-	equals(files[0], P("disabledfile.conf.disabled"));
-	equals(files[1], P("disabledfile.disabled"));
-	equals(files[2], P("disabledfile.list.disabled"));
-
-	// Files with disabled or no extension
-	files = GetListOfFilesInDir(argv[1], "disabled", true, true);
-	equals(files.size(), 5);
-	equals(files[0], P("01yet-anothernormalfile"));
-	equals(files[1], P("anormalfile"));
-	equals(files[2], P("disabledfile.conf.disabled"));
-	equals(files[3], P("disabledfile.disabled"));
-	equals(files[4], P("disabledfile.list.disabled"));
-
-	return 0;
+   std::string tempdir;
+   createTemporaryDirectory("getlistoffiles", tempdir);
+
+   createFile(tempdir, "anormalfile");
+   createFile(tempdir, "01yet-anothernormalfile");
+   createFile(tempdir, "anormalapt.conf");
+   createFile(tempdir, "01yet-anotherapt.conf");
+   createFile(tempdir, "anormalapt.list");
+   createFile(tempdir, "01yet-anotherapt.list");
+   createFile(tempdir, "wrongextension.wron");
+   createFile(tempdir, "wrong-extension.wron");
+   createFile(tempdir, "strangefile.");
+   createFile(tempdir, "s.t.r.a.n.g.e.f.i.l.e");
+   createFile(tempdir, ".hiddenfile");
+   createFile(tempdir, ".hiddenfile.conf");
+   createFile(tempdir, ".hiddenfile.list");
+   createFile(tempdir, "multi..dot");
+   createFile(tempdir, "multi.dot.conf");
+   createFile(tempdir, "multi.dot.list");
+   createFile(tempdir, "disabledfile.disabled");
+   createFile(tempdir, "disabledfile.conf.disabled");
+   createFile(tempdir, "disabledfile.list.disabled");
+   createFile(tempdir, "invälid.conf");
+   createFile(tempdir, "invalíd");
+   createFile(tempdir, "01invalíd");
+   createDirectory(tempdir, "invaliddir");
+   createDirectory(tempdir, "directory.conf");
+   createDirectory(tempdir, "directory.list");
+   createDirectory(tempdir, "directory.wron");
+   createDirectory(tempdir, "directory.list.disabled");
+   createLink(tempdir, "anormalfile", "linkedfile.list");
+   createLink(tempdir, "invaliddir", "linkeddir.list");
+   createLink(tempdir, "non-existing-file", "brokenlink.list");
+
+   // Files with no extension
+   std::vector<std::string> files = GetListOfFilesInDir(tempdir, "", true);
+   ASSERT_EQ(2, files.size());
+   EXPECT_EQ(P("01yet-anothernormalfile"), files[0]);
+   EXPECT_EQ(P("anormalfile"), files[1]);
+
+   // Files with no extension - should be the same as above
+   files = GetListOfFilesInDir(tempdir, "", true, true);
+   ASSERT_EQ(2, files.size());
+   EXPECT_EQ(P("01yet-anothernormalfile"), files[0]);
+   EXPECT_EQ(P("anormalfile"), files[1]);
+
+   // Files with impossible extension
+   files = GetListOfFilesInDir(tempdir, "impossible", true);
+   EXPECT_TRUE(files.empty());
+
+   // Files with impossible or no extension
+   files = GetListOfFilesInDir(tempdir, "impossible", true, true);
+   ASSERT_EQ(2, files.size());
+   EXPECT_EQ(P("01yet-anothernormalfile"), files[0]);
+   EXPECT_EQ(P("anormalfile"), files[1]);
+
+   // Files with list extension - nothing more
+   files = GetListOfFilesInDir(tempdir, "list", true);
+   ASSERT_EQ(4, files.size());
+   EXPECT_EQ(P("01yet-anotherapt.list"), files[0]);
+   EXPECT_EQ(P("anormalapt.list"), files[1]);
+   EXPECT_EQ(P("linkedfile.list"), files[2]);
+   EXPECT_EQ(P("multi.dot.list"), files[3]);
+
+   // Files with conf or no extension
+   files = GetListOfFilesInDir(tempdir, "conf", true, true);
+   ASSERT_EQ(5, files.size());
+   EXPECT_EQ(P("01yet-anotherapt.conf"), files[0]);
+   EXPECT_EQ(P("01yet-anothernormalfile"), files[1]);
+   EXPECT_EQ(P("anormalapt.conf"), files[2]);
+   EXPECT_EQ(P("anormalfile"), files[3]);
+   EXPECT_EQ(P("multi.dot.conf"), files[4]);
+
+   // Files with disabled extension - nothing more
+   files = GetListOfFilesInDir(tempdir, "disabled", true);
+   ASSERT_EQ(3, files.size());
+   EXPECT_EQ(P("disabledfile.conf.disabled"), files[0]);
+   EXPECT_EQ(P("disabledfile.disabled"), files[1]);
+   EXPECT_EQ(P("disabledfile.list.disabled"), files[2]);
+
+   // Files with disabled or no extension
+   files = GetListOfFilesInDir(tempdir, "disabled", true, true);
+   ASSERT_EQ(5, files.size());
+   EXPECT_EQ(P("01yet-anothernormalfile"), files[0]);
+   EXPECT_EQ(P("anormalfile"), files[1]);
+   EXPECT_EQ(P("disabledfile.conf.disabled"), files[2]);
+   EXPECT_EQ(P("disabledfile.disabled"), files[3]);
+   EXPECT_EQ(P("disabledfile.list.disabled"), files[4]);
+
+   removeDirectory(tempdir);
 }
diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc
index b6939231d..05b95db85 100644
--- a/test/libapt/globalerror_test.cc
+++ b/test/libapt/globalerror_test.cc
@@ -1,112 +1,135 @@
+#include <config.h>
+
 #include <apt-pkg/error.h>
 
-#include "assert.h"
+#include <stddef.h>
 #include <string>
 #include <errno.h>
 #include <string.h>
 
-int main(int argc,char *argv[])
-{
-	std::string const textOfErrnoZero(strerror(0));
-
-	equals(_error->empty(), true);
-	equals(_error->PendingError(), false);
-	equals(_error->Notice("%s Notice", "A"), false);
-	equals(_error->empty(), true);
-	equals(_error->empty(GlobalError::DEBUG), false);
-	equals(_error->PendingError(), false);
-	equals(_error->Error("%s horrible %s %d times", "Something", "happened", 2), false);
-	equals(_error->PendingError(), true);
-	std::string text;
-	equals(_error->PopMessage(text), false);
-	equals(_error->PendingError(), true);
-	equals(text, "A Notice");
-	equals(_error->PopMessage(text), true);
-	equals(text, "Something horrible happened 2 times");
-	equals(_error->empty(GlobalError::DEBUG), true);
-	equals(_error->PendingError(), false);
-	equals(_error->Error("%s horrible %s %d times", "Something", "happened", 2), false);
-	equals(_error->PendingError(), true);
-	equals(_error->empty(GlobalError::FATAL), false);
-	_error->Discard();
+#include <gtest/gtest.h>
 
-	equals(_error->empty(), true);
-	equals(_error->PendingError(), false);
-	equals(_error->Notice("%s Notice", "A"), false);
-	equals(_error->Error("%s horrible %s %d times", "Something", "happened", 2), false);
-	equals(_error->PendingError(), true);
-	equals(_error->empty(GlobalError::NOTICE), false);
-	_error->PushToStack();
-	equals(_error->empty(GlobalError::NOTICE), true);
-	equals(_error->PendingError(), false);
-	equals(_error->Warning("%s Warning", "A"), false);
-	equals(_error->empty(GlobalError::ERROR), true);
-	equals(_error->PendingError(), false);
-	_error->RevertToStack();
-	equals(_error->empty(GlobalError::ERROR), false);
-	equals(_error->PendingError(), true);
-	equals(_error->PopMessage(text), false);
-	equals(_error->PendingError(), true);
-	equals(text, "A Notice");
-	equals(_error->PopMessage(text), true);
-	equals(text, "Something horrible happened 2 times");
-	equals(_error->PendingError(), false);
-	equals(_error->empty(), true);
+TEST(GlobalErrorTest,BasicDiscard)
+{
+   GlobalError e;
+   EXPECT_TRUE(e.empty());
+   EXPECT_FALSE(e.PendingError());
+   EXPECT_FALSE(e.Notice("%s Notice", "A"));
+   EXPECT_TRUE(e.empty());
+   EXPECT_FALSE(e.empty(GlobalError::DEBUG));
+   EXPECT_FALSE(e.PendingError());
+   EXPECT_FALSE(e.Error("%s horrible %s %d times", "Something", "happened", 2));
+   EXPECT_TRUE(e.PendingError());
 
-	equals(_error->Notice("%s Notice", "A"), false);
-	equals(_error->Error("%s horrible %s %d times", "Something", "happened", 2), false);
-	equals(_error->PendingError(), true);
-	equals(_error->empty(GlobalError::NOTICE), false);
-	_error->PushToStack();
-	equals(_error->empty(GlobalError::NOTICE), true);
-	equals(_error->PendingError(), false);
-	equals(_error->Warning("%s Warning", "A"), false);
-	equals(_error->empty(GlobalError::ERROR), true);
-	equals(_error->PendingError(), false);
-	_error->MergeWithStack();
-	equals(_error->empty(GlobalError::ERROR), false);
-	equals(_error->PendingError(), true);
-	equals(_error->PopMessage(text), false);
-	equals(_error->PendingError(), true);
-	equals(text, "A Notice");
-	equals(_error->PopMessage(text), true);
-	equals(text, "Something horrible happened 2 times");
-	equals(_error->PendingError(), false);
-	equals(_error->empty(), false);
-	equals(_error->PopMessage(text), false);
-	equals(text, "A Warning");
-	equals(_error->empty(), true);
+   std::string text;
+   EXPECT_FALSE(e.PopMessage(text));
+   EXPECT_TRUE(e.PendingError());
+   EXPECT_EQ("A Notice", text);
+   EXPECT_TRUE(e.PopMessage(text));
+   EXPECT_EQ("Something horrible happened 2 times", text);
+   EXPECT_TRUE(e.empty(GlobalError::DEBUG));
+   EXPECT_FALSE(e.PendingError());
+   EXPECT_FALSE(e.Error("%s horrible %s %d times", "Something", "happened", 2));
+   EXPECT_TRUE(e.PendingError());
+   EXPECT_FALSE(e.empty(GlobalError::FATAL));
+   e.Discard();
 
-	errno = 0;
-	equals(_error->Errno("errno", "%s horrible %s %d times", "Something", "happened", 2), false);
-	equals(_error->empty(), false);
-	equals(_error->PendingError(), true);
-	equals(_error->PopMessage(text), true);
-	equals(_error->PendingError(), false);
-	equals(text, std::string("Something horrible happened 2 times - errno (0: ").append(textOfErrnoZero).append(")"));
-	equals(_error->empty(), true);
+   EXPECT_TRUE(e.empty());
+   EXPECT_FALSE(e.PendingError());
+}
+TEST(GlobalErrorTest,StackPushing)
+{
+   GlobalError e;
+   EXPECT_FALSE(e.Notice("%s Notice", "A"));
+   EXPECT_FALSE(e.Error("%s horrible %s %d times", "Something", "happened", 2));
+   EXPECT_TRUE(e.PendingError());
+   EXPECT_FALSE(e.empty(GlobalError::NOTICE));
+   e.PushToStack();
+   EXPECT_TRUE(e.empty(GlobalError::NOTICE));
+   EXPECT_FALSE(e.PendingError());
+   EXPECT_FALSE(e.Warning("%s Warning", "A"));
+   EXPECT_TRUE(e.empty(GlobalError::ERROR));
+   EXPECT_FALSE(e.PendingError());
+   e.RevertToStack();
+   EXPECT_FALSE(e.empty(GlobalError::ERROR));
+   EXPECT_TRUE(e.PendingError());
 
-	std::string longText;
-	for (size_t i = 0; i < 500; ++i)
-		longText.append("a");
-	equals(_error->Error("%s horrible %s %d times", longText.c_str(), "happened", 2), false);
-	equals(_error->PopMessage(text), true);
-	equals(text, std::string(longText).append(" horrible happened 2 times"));
+   std::string text;
+   EXPECT_FALSE(e.PopMessage(text));
+   EXPECT_TRUE(e.PendingError());
+   EXPECT_EQ("A Notice", text);
+   EXPECT_TRUE(e.PopMessage(text));
+   EXPECT_EQ("Something horrible happened 2 times", text);
+   EXPECT_FALSE(e.PendingError());
+   EXPECT_TRUE(e.empty());
 
-	equals(_error->Errno("errno", "%s horrible %s %d times", longText.c_str(), "happened", 2), false);
-	equals(_error->PopMessage(text), true);
-	equals(text, std::string(longText).append(" horrible happened 2 times - errno (0: ").append(textOfErrnoZero).append(")"));
+   EXPECT_FALSE(e.Notice("%s Notice", "A"));
+   EXPECT_FALSE(e.Error("%s horrible %s %d times", "Something", "happened", 2));
+   EXPECT_TRUE(e.PendingError());
+   EXPECT_FALSE(e.empty(GlobalError::NOTICE));
+   e.PushToStack();
+   EXPECT_TRUE(e.empty(GlobalError::NOTICE));
+   EXPECT_FALSE(e.PendingError());
+   EXPECT_FALSE(e.Warning("%s Warning", "A"));
+   EXPECT_TRUE(e.empty(GlobalError::ERROR));
+   EXPECT_FALSE(e.PendingError());
+   e.MergeWithStack();
+   EXPECT_FALSE(e.empty(GlobalError::ERROR));
+   EXPECT_TRUE(e.PendingError());
+   EXPECT_FALSE(e.PopMessage(text));
+   EXPECT_TRUE(e.PendingError());
+   EXPECT_EQ("A Notice", text);
+   EXPECT_TRUE(e.PopMessage(text));
+   EXPECT_EQ("Something horrible happened 2 times", text);
+   EXPECT_FALSE(e.PendingError());
+   EXPECT_FALSE(e.empty());
+   EXPECT_FALSE(e.PopMessage(text));
+   EXPECT_EQ("A Warning", text);
+   EXPECT_TRUE(e.empty());
+}
+TEST(GlobalErrorTest,Errno)
+{
+   GlobalError e;
+   std::string const textOfErrnoZero(strerror(0));
+   errno = 0;
+   EXPECT_FALSE(e.Errno("errno", "%s horrible %s %d times", "Something", "happened", 2));
+   EXPECT_FALSE(e.empty());
+   EXPECT_TRUE(e.PendingError());
+   std::string text;
+   EXPECT_TRUE(e.PopMessage(text));
+   EXPECT_FALSE(e.PendingError());
+   EXPECT_EQ(std::string("Something horrible happened 2 times - errno (0: ").append(textOfErrnoZero).append(")"), text);
+   EXPECT_TRUE(e.empty());
+}
+TEST(GlobalErrorTest,LongMessage)
+{
+   GlobalError e;
+   std::string const textOfErrnoZero(strerror(0));
+   errno = 0;
+   std::string text, longText;
+   for (size_t i = 0; i < 500; ++i)
+      longText.append("a");
+   EXPECT_FALSE(e.Error("%s horrible %s %d times", longText.c_str(), "happened", 2));
+   EXPECT_TRUE(e.PopMessage(text));
+   EXPECT_EQ(std::string(longText).append(" horrible happened 2 times"), text);
 
-	equals(_error->Warning("Репозиторий не обновлён и будут %d %s", 4, "test"), false);
-	equals(_error->PopMessage(text), false);
-	equals(text, "Репозиторий не обновлён и будут 4 test");
+   EXPECT_FALSE(e.Errno("errno", "%s horrible %s %d times", longText.c_str(), "happened", 2));
+   EXPECT_TRUE(e.PopMessage(text));
+   EXPECT_EQ(std::string(longText).append(" horrible happened 2 times - errno (0: ").append(textOfErrnoZero).append(")"), text);
+}
+TEST(GlobalErrorTest,UTF8Message)
+{
+   GlobalError e;
+   std::string text;
 
-	longText.clear();
-	for (size_t i = 0; i < 50; ++i)
-		longText.append("РезийбёбAZ");
-	equals(_error->Warning("%s", longText.c_str()), false);
-	equals(_error->PopMessage(text), false);
-	equals(text, longText);
+   EXPECT_FALSE(e.Warning("Репозиторий не обновлён и будут %d %s", 4, "test"));
+   EXPECT_FALSE(e.PopMessage(text));
+   EXPECT_EQ("Репозиторий не обновлён и будут 4 test", text);
 
-	return 0;
+   std::string longText;
+   for (size_t i = 0; i < 50; ++i)
+      longText.append("РезийбёбAZ");
+   EXPECT_FALSE(e.Warning("%s", longText.c_str()));
+   EXPECT_FALSE(e.PopMessage(text));
+   EXPECT_EQ(longText, text);
 }
diff --git a/test/libapt/gtest_runner.cc b/test/libapt/gtest_runner.cc
new file mode 100644
index 000000000..5823c55de
--- /dev/null
+++ b/test/libapt/gtest_runner.cc
@@ -0,0 +1,19 @@
+#include <gtest/gtest.h>
+#include <apt-pkg/error.h>
+int main(int argc, char **argv) {
+   ::testing::InitGoogleTest(&argc, argv);
+   int result = RUN_ALL_TESTS();
+   if (_error->empty() == false)
+   {
+      std::cerr << "The test generated the following global messages:" << std::endl;
+      _error->DumpErrors(std::cerr);
+      // messages on the stack can't be right, error out
+      // even if we have no idea where this message came from
+      if (result == 0)
+      {
+	 std::cerr << "All tests successful, but messages were generated, so still a failure!" << std::endl;
+	 return 29;
+      }
+   }
+   return result;
+}
diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc
index 3da89052b..c06d85e03 100644
--- a/test/libapt/hashsums_test.cc
+++ b/test/libapt/hashsums_test.cc
@@ -1,14 +1,19 @@
+#include <config.h>
+
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/sha2.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
+
 #include <iostream>
+#include <stdlib.h>
+#include <string>
 
-#include <stdio.h>
+#include <gtest/gtest.h>
 
-#include "assert.h"
+#include "file-helpers.h"
 
 template <class T> void Test(const char *In,const char *Out)
 {
@@ -17,162 +22,201 @@ template <class T> void Test(const char *In,const char *Out)
    equals(Sum.Result().Value(), Out);
 }
 
-template <class T> void TestMill(const char *Out)
+
+
+TEST(HashSumsTest,SummationStrings)
 {
-   T Sum;
+#define EXPECT_SUM(Summation, In, Out) \
+   { \
+      Summation Sum; \
+      Sum.Add(In); \
+      EXPECT_EQ(Sum.Result().Value(), Out) << #Summation << " for '" << In << "'"; \
+   }
+
+   // From  FIPS PUB 180-1
+   EXPECT_SUM(SHA1Summation, "","da39a3ee5e6b4b0d3255bfef95601890afd80709");
+   EXPECT_SUM(SHA1Summation, "abc","a9993e364706816aba3e25717850c26c9cd0d89d");
+   EXPECT_SUM(SHA1Summation, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+	 "84983e441c3bd26ebaae4aa1f95129e5e54670f1");
+
+   // MD5 tests from RFC 1321
+   EXPECT_SUM(MD5Summation, "","d41d8cd98f00b204e9800998ecf8427e");
+   EXPECT_SUM(MD5Summation, "a","0cc175b9c0f1b6a831c399e269772661");
+   EXPECT_SUM(MD5Summation, "abc","900150983cd24fb0d6963f7d28e17f72");
+   EXPECT_SUM(MD5Summation, "message digest","f96b697d7cb7938d525a2f31aaf161d0");
+   EXPECT_SUM(MD5Summation, "abcdefghijklmnopqrstuvwxyz","c3fcd3d76192e4007dfb496cca67e13b");
+   EXPECT_SUM(MD5Summation, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+	 "d174ab98d277d9f5a5611c2c9f419d9f");
+   EXPECT_SUM(MD5Summation, "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
+	 "57edf4a22be3c955ac49da2e2107b67a");
 
-   const unsigned char As[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-   unsigned Count = 1000000;
-   for (; Count != 0;)
+   // SHA-256, From FIPS 180-2
+   EXPECT_SUM(SHA256Summation, "", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855");
+   EXPECT_SUM(SHA256Summation, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+	 "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1");
+
+   // SHA-512
+   EXPECT_SUM(SHA512Summation, "",
+	 "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce"
+	 "47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e");
+   EXPECT_SUM(SHA512Summation, "abc",
+	 "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a"
+	 "2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f");
+
+
+   EXPECT_SUM(MD5Summation, "The quick brown fox jumps over the lazy dog", "9e107d9d372bb6826bd81d3542a419d6");
+   EXPECT_SUM(MD5Summation, "The quick brown fox jumps over the lazy dog.", "e4d909c290d0fb1ca068ffaddf22cbd0");
+   EXPECT_SUM(SHA1Summation, "The quick brown fox jumps over the lazy dog", "2fd4e1c67a2d28fced849ee1bb76e7391b93eb12");
+   EXPECT_SUM(SHA1Summation, "The quick brown fox jumps over the lazy cog", "de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3");
+   EXPECT_SUM(SHA256Summation, "The quick brown fox jumps over the lazy dog", "d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592");
+   EXPECT_SUM(SHA256Summation, "The quick brown fox jumps over the lazy dog.", "ef537f25c895bfa782526529a9b63d97aa631564d5d789c2b765448c8635fb6c");
+   EXPECT_SUM(SHA512Summation, "The quick brown fox jumps over the lazy dog", "07e547d9586f6a73f73fbac0435ed76951218fb7d0c8d788a309d785436bbb64"
+	 "2e93a252a954f23912547d1e8a3b5ed6e1bfd7097821233fa0538f3db854fee6");
+   EXPECT_SUM(SHA512Summation, "The quick brown fox jumps over the lazy dog.", "91ea1245f20d46ae9a037a989f54f1f790f0a47607eeb8a14d12890cea77a1bb"
+	 "c6c7ed9cf205e67b7f2b8fd4c7dfd3a7a8617e45f3c463d481c7e586c39ac1ed");
+
+#undef EXPECT_SUM
+}
+TEST(HashSumsTest, Mill)
+{
+   SHA1Summation Sum1;
+
+   const unsigned char As[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+   size_t const AsCount = sizeof(As)/sizeof(As[0]) - 1;
+   size_t Count = 1000000;
+   while (Count != 0)
    {
-      if (Count >= 64)
+      if (Count >= AsCount)
       {
-	 Sum.Add(As,64);
-	 Count -= 64;
+	 Sum1.Add(As, AsCount);
+	 Count -= AsCount;
       }
       else
       {
-	 Sum.Add(As,Count);
+	 Sum1.Add(As,Count);
 	 Count = 0;
       }
    }
 
-   if (stringcasecmp(Sum.Result().Value(), Out) != 0)
-      abort();
+   EXPECT_EQ("34aa973cd4c4daa4f61eeb2bdbad27316534016f", Sum1.Result().Value());
 }
 
-int main(int argc, char** argv)
+static void getSummationString(char const * const type, std::string &sum)
 {
-   // test HashSumValue which doesn't calculate but just stores sums
-   {
-   string md5sum = argv[2];
-   MD5SumValue md5(md5sum);
-   equals(md5.Value(), md5sum);
-   }
-   {
-   string sha1sum = argv[3];
-   SHA1SumValue sha1(sha1sum);
-   equals(sha1.Value(), sha1sum);
-   }
-   {
-   string sha2sum = argv[4];
-   SHA256SumValue sha2(sha2sum);
-   equals(sha2.Value(), sha2sum);
-   }
-   {
-   string sha2sum = argv[5];
-   SHA512SumValue sha2(sha2sum);
-   equals(sha2.Value(), sha2sum);
-   }
+   /* to compare our result with an independent source we call the specific binaries
+      and read their result back. We do this with a little trick by claiming that the
+      summation is a compressor – and open the 'compressed' file later on directly to
+      read out the summation sum calculated by it */
+   APT::Configuration::Compressor compress(type, ".ext", type, NULL, NULL, 99);
+   std::string name("apt-test-");
+   name.append("hashsums").append(".XXXXXX");
+   char * tempfile = strdup(name.c_str());
+   int tempfile_fd = mkstemp(tempfile);
+   close(tempfile_fd);
+   ASSERT_NE(-1, tempfile_fd);
+
+   FileFd fd;
+   ASSERT_TRUE(fd.Open(tempfile, FileFd::WriteOnly | FileFd::Empty, compress));
+   ASSERT_TRUE(fd.IsOpen());
+   FileFd input(__FILE__, FileFd::ReadOnly);
+   ASSERT_TRUE(input.IsOpen());
+   ASSERT_NE(0, input.FileSize());
+   ASSERT_TRUE(CopyFile(input, fd));
+   ASSERT_TRUE(input.IsOpen());
+   ASSERT_TRUE(fd.IsOpen());
+   ASSERT_FALSE(fd.Failed());
+   input.Close();
+   fd.Close();
+   ASSERT_TRUE(fd.Open(tempfile, FileFd::ReadOnly, FileFd::None));
+   ASSERT_TRUE(fd.IsOpen());
+   ASSERT_NE(0, fd.FileSize());
+   ASSERT_FALSE(fd.Failed());
+   unlink(tempfile);
+   free(tempfile);
+   char readback[2000];
+   unsigned long long actual;
+   ASSERT_TRUE(fd.Read(readback, sizeof(readback)/sizeof(readback[0]), &actual));
+   actual -= 4;
+   readback[actual] = '\0';
+   sum = readback;
+}
+TEST(HashSumsTest, FileBased)
+{
+   std::string summation;
 
-   // From  FIPS PUB 180-1
-   Test<SHA1Summation>("","da39a3ee5e6b4b0d3255bfef95601890afd80709");
-   Test<SHA1Summation>("abc","a9993e364706816aba3e25717850c26c9cd0d89d");
-   Test<SHA1Summation>("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-		       "84983e441c3bd26ebaae4aa1f95129e5e54670f1");
-   TestMill<SHA1Summation>("34aa973cd4c4daa4f61eeb2bdbad27316534016f");
+   getSummationString("md5sum", summation);
+   MD5SumValue md5(summation);
+   EXPECT_EQ(md5.Value(), summation);
 
-   // MD5 tests from RFC 1321
-   Test<MD5Summation>("","d41d8cd98f00b204e9800998ecf8427e");
-   Test<MD5Summation>("a","0cc175b9c0f1b6a831c399e269772661");
-   Test<MD5Summation>("abc","900150983cd24fb0d6963f7d28e17f72");
-   Test<MD5Summation>("message digest","f96b697d7cb7938d525a2f31aaf161d0");
-   Test<MD5Summation>("abcdefghijklmnopqrstuvwxyz","c3fcd3d76192e4007dfb496cca67e13b");
-   Test<MD5Summation>("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-		      "d174ab98d277d9f5a5611c2c9f419d9f");
-   Test<MD5Summation>("12345678901234567890123456789012345678901234567890123456789012345678901234567890",
-		      "57edf4a22be3c955ac49da2e2107b67a");
+   getSummationString("sha1sum", summation);
+   SHA1SumValue sha1(summation);
+   EXPECT_EQ(sha1.Value(), summation);
 
-   // SHA-256, From FIPS 180-2
-   Test<SHA256Summation>("", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855");
-   Test<SHA256Summation>("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-			 "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1");
+   getSummationString("sha256sum", summation);
+   SHA256SumValue sha256(summation);
+   EXPECT_EQ(sha256.Value(), summation);
+
+   getSummationString("sha512sum", summation);
+   SHA512SumValue sha512(summation);
+   EXPECT_EQ(sha512.Value(), summation);
+
+   FileFd fd(__FILE__, FileFd::ReadOnly);
+   EXPECT_TRUE(fd.IsOpen());
 
-   // SHA-512
-   Test<SHA512Summation>("",
-	"cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce"
-	"47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e");
-   Test<SHA512Summation>(
-      "abc",
-      "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a"
-      "2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f");
-
-
-   Test<MD5Summation>("The quick brown fox jumps over the lazy dog", "9e107d9d372bb6826bd81d3542a419d6");
-   Test<MD5Summation>("The quick brown fox jumps over the lazy dog.", "e4d909c290d0fb1ca068ffaddf22cbd0");
-   Test<SHA1Summation>("The quick brown fox jumps over the lazy dog", "2fd4e1c67a2d28fced849ee1bb76e7391b93eb12");
-   Test<SHA1Summation>("The quick brown fox jumps over the lazy cog", "de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3");
-   Test<SHA256Summation>("The quick brown fox jumps over the lazy dog", "d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592");
-   Test<SHA256Summation>("The quick brown fox jumps over the lazy dog.", "ef537f25c895bfa782526529a9b63d97aa631564d5d789c2b765448c8635fb6c");
-   Test<SHA512Summation>("The quick brown fox jumps over the lazy dog", "07e547d9586f6a73f73fbac0435ed76951218fb7d0c8d788a309d785436bbb64"
-									"2e93a252a954f23912547d1e8a3b5ed6e1bfd7097821233fa0538f3db854fee6");
-   Test<SHA512Summation>("The quick brown fox jumps over the lazy dog.", "91ea1245f20d46ae9a037a989f54f1f790f0a47607eeb8a14d12890cea77a1bb"
-									 "c6c7ed9cf205e67b7f2b8fd4c7dfd3a7a8617e45f3c463d481c7e586c39ac1ed");
-
-   FileFd fd(argv[1], FileFd::ReadOnly);
-   if (fd.IsOpen() == false) {
-      std::cerr << "Can't open file for 1. testing: " << argv[1] << std::endl;
-      return 1;
-   }
    {
-   Hashes hashes;
-   hashes.AddFD(fd.Fd());
-   equals(argv[2], hashes.MD5.Result().Value());
-   equals(argv[3], hashes.SHA1.Result().Value());
-   equals(argv[4], hashes.SHA256.Result().Value());
-   equals(argv[5], hashes.SHA512.Result().Value());
+      Hashes hashes;
+      hashes.AddFD(fd.Fd());
+      EXPECT_EQ(md5.Value(), hashes.MD5.Result().Value());
+      EXPECT_EQ(sha1.Value(), hashes.SHA1.Result().Value());
+      EXPECT_EQ(sha256.Value(), hashes.SHA256.Result().Value());
+      EXPECT_EQ(sha512.Value(), hashes.SHA512.Result().Value());
    }
    unsigned long sz = fd.FileSize();
    fd.Seek(0);
    {
-   Hashes hashes;
-   hashes.AddFD(fd.Fd(), sz);
-   equals(argv[2], hashes.MD5.Result().Value());
-   equals(argv[3], hashes.SHA1.Result().Value());
-   equals(argv[4], hashes.SHA256.Result().Value());
-   equals(argv[5], hashes.SHA512.Result().Value());
+      Hashes hashes;
+      hashes.AddFD(fd.Fd(), sz);
+      EXPECT_EQ(md5.Value(), hashes.MD5.Result().Value());
+      EXPECT_EQ(sha1.Value(), hashes.SHA1.Result().Value());
+      EXPECT_EQ(sha256.Value(), hashes.SHA256.Result().Value());
+      EXPECT_EQ(sha512.Value(), hashes.SHA512.Result().Value());
    }
    fd.Seek(0);
    {
-   MD5Summation md5;
-   md5.AddFD(fd.Fd());
-   equals(argv[2], md5.Result().Value());
+      MD5Summation MD5;
+      MD5.AddFD(fd.Fd());
+      EXPECT_EQ(md5.Value(), MD5.Result().Value());
    }
    fd.Seek(0);
    {
-   SHA1Summation sha1;
-   sha1.AddFD(fd.Fd());
-   equals(argv[3], sha1.Result().Value());
+      SHA1Summation SHA1;
+      SHA1.AddFD(fd.Fd());
+      EXPECT_EQ(sha1.Value(), SHA1.Result().Value());
    }
    fd.Seek(0);
    {
-   SHA256Summation sha2;
-   sha2.AddFD(fd.Fd());
-   equals(argv[4], sha2.Result().Value());
+      SHA256Summation SHA2;
+      SHA2.AddFD(fd.Fd());
+      EXPECT_EQ(sha256.Value(), SHA2.Result().Value());
    }
    fd.Seek(0);
    {
-   SHA512Summation sha2;
-   sha2.AddFD(fd.Fd());
-   equals(argv[5], sha2.Result().Value());
+      SHA512Summation SHA2;
+      SHA2.AddFD(fd.Fd());
+      EXPECT_EQ(sha512.Value(), SHA2.Result().Value());
    }
    fd.Close();
 
-   // test HashString code
    {
-   HashString sha2("SHA256", argv[4]);
-   equals(sha2.VerifyFile(argv[1]), true);
+      HashString sha2("SHA256", sha256.Value());
+      EXPECT_TRUE(sha2.VerifyFile(__FILE__));
    }
    {
-   HashString sha2("SHA512", argv[5]);
-   equals(sha2.VerifyFile(argv[1]), true);
+      HashString sha2("SHA512", sha512.Value());
+      EXPECT_TRUE(sha2.VerifyFile(__FILE__));
    }
    {
-   HashString sha2("SHA256:" + std::string(argv[4]));
-   equals(sha2.VerifyFile(argv[1]), true);
+      HashString sha2("SHA256:" + sha256.Value());
+      EXPECT_TRUE(sha2.VerifyFile(__FILE__));
    }
-
-   return 0;
 }
-
-
diff --git a/test/libapt/indexcopytosourcelist_test.cc b/test/libapt/indexcopytosourcelist_test.cc
index 69d8fae86..bec87601f 100644
--- a/test/libapt/indexcopytosourcelist_test.cc
+++ b/test/libapt/indexcopytosourcelist_test.cc
@@ -1,33 +1,41 @@
+#include <config.h>
+
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/indexcopy.h>
 
 #include <string>
+#include <stdio.h>
 
-#include "assert.h"
+#include <gtest/gtest.h>
 
 class NoCopy : public IndexCopy {
-public:
-   std::string ConvertToSourceList(std::string CD,std::string Path) {
-      IndexCopy::ConvertToSourceList(CD, Path);
-      return Path;
-   }
-   bool GetFile(std::string &Filename,unsigned long long &Size) { return false; }
-   bool RewriteEntry(FILE *Target,std::string File) { return false; }
-   const char *GetFileName() { return NULL; }
-   const char *Type() { return NULL; }
+   public:
+      std::string ConvertToSourceList(std::string CD,std::string Path) {
+	 IndexCopy::ConvertToSourceList(CD, Path);
+	 return Path;
+      }
+      bool GetFile(std::string &/*Filename*/, unsigned long long &/*Size*/) { return false; }
+      bool RewriteEntry(FILE * /*Target*/, std::string /*File*/) { return false; }
+      const char *GetFileName() { return NULL; }
+      const char *Type() { return NULL; }
 
 };
 
-int main(int argc, char const *argv[]) {
+TEST(IndexCopyTest, ConvertToSourceList)
+{
    NoCopy ic;
    std::string const CD("/media/cdrom/");
 
    char const * Releases[] = { "unstable", "wheezy-updates", NULL };
    char const * Components[] = { "main", "non-free", NULL };
 
-   for (char const ** Release = Releases; *Release != NULL; ++Release) {
-      for (char const ** Component = Components; *Component != NULL; ++Component) {
+   for (char const ** Release = Releases; *Release != NULL; ++Release)
+   {
+      SCOPED_TRACE(std::string("Release ") + *Release);
+      for (char const ** Component = Components; *Component != NULL; ++Component)
+      {
+	 SCOPED_TRACE(std::string("Component ") + *Component);
 	 std::string const Path = std::string("dists/") + *Release + "/" + *Component + "/";
 	 std::string const Binary = Path + "binary-";
 	 std::string const A = Binary + "armel/";
@@ -38,49 +46,47 @@ int main(int argc, char const *argv[]) {
 
 	 _config->Clear("APT");
 	 APT::Configuration::getArchitectures(false);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + A), A);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + B), B);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + C), C);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + S), List);
+	 EXPECT_EQ(A, ic.ConvertToSourceList("/media/cdrom/", CD + A));
+	 EXPECT_EQ(B, ic.ConvertToSourceList("/media/cdrom/", CD + B));
+	 EXPECT_EQ(C, ic.ConvertToSourceList("/media/cdrom/", CD + C));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S));
 
 	 _config->Clear("APT");
 	 _config->Set("APT::Architecture", "mips");
 	 _config->Set("APT::Architectures::", "mips");
 	 APT::Configuration::getArchitectures(false);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + A), A);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + B), List);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + C), C);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + S), List);
+	 EXPECT_EQ(A, ic.ConvertToSourceList("/media/cdrom/", CD + A));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + B));
+	 EXPECT_EQ(C, ic.ConvertToSourceList("/media/cdrom/", CD + C));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S));
 
 	 _config->Clear("APT");
 	 _config->Set("APT::Architecture", "kfreebsd-mips");
 	 _config->Set("APT::Architectures::", "kfreebsd-mips");
 	 APT::Configuration::getArchitectures(false);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + A), A);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + B), B);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + C), List);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + S), List);
+	 EXPECT_EQ(A, ic.ConvertToSourceList("/media/cdrom/", CD + A));
+	 EXPECT_EQ(B, ic.ConvertToSourceList("/media/cdrom/", CD + B));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + C));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S));
 
 	 _config->Clear("APT");
 	 _config->Set("APT::Architecture", "armel");
 	 _config->Set("APT::Architectures::", "armel");
 	 APT::Configuration::getArchitectures(false);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + A), List);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + B), B);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + C), C);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + S), List);
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + A));
+	 EXPECT_EQ(B, ic.ConvertToSourceList("/media/cdrom/", CD + B));
+	 EXPECT_EQ(C, ic.ConvertToSourceList("/media/cdrom/", CD + C));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S));
 
 	 _config->Clear("APT");
 	 _config->Set("APT::Architecture", "armel");
 	 _config->Set("APT::Architectures::", "armel");
 	 _config->Set("APT::Architectures::", "mips");
 	 APT::Configuration::getArchitectures(false);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + A), List);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + B), List);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + C), C);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + S), List);
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + A));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + B));
+	 EXPECT_EQ(C, ic.ConvertToSourceList("/media/cdrom/", CD + C));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S));
       }
    }
-
-   return 0;
 }
diff --git a/test/libapt/install_progress_test.cc b/test/libapt/install_progress_test.cc
new file mode 100644
index 000000000..a70fc9261
--- /dev/null
+++ b/test/libapt/install_progress_test.cc
@@ -0,0 +1,20 @@
+#include <config.h>
+
+#include <apt-pkg/install-progress.h>
+
+#include <string>
+
+#include <gtest/gtest.h>
+
+TEST(InstallProgressTest, FancyGetTextProgressStr)
+{
+   APT::Progress::PackageManagerFancy p;
+
+   EXPECT_EQ(60, p.GetTextProgressStr(0.5, 60).size());
+   EXPECT_EQ("[#.]", p.GetTextProgressStr(0.5, 4));
+   EXPECT_EQ("[#.........]", p.GetTextProgressStr(0.1, 12));
+   EXPECT_EQ("[#########.]", p.GetTextProgressStr(0.9, 12));
+
+   // deal with incorrect inputs gracefully (or should we die instead?)
+   EXPECT_EQ("", p.GetTextProgressStr(-999, 12));
+}
diff --git a/test/libapt/makefile b/test/libapt/makefile
index a8e053d6e..69a13fd92 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -8,112 +8,66 @@ APT_DOMAIN=none
 include ../../buildlib/defaults.mak
 
 .PHONY: test
-test:
-	./run-tests
-
-# Program for testing getLanguageCode
-PROGRAM = getLanguages${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = getlanguages_test.cc
-include $(PROGRAM_H)
-
-PROGRAM = getArchitectures${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = getarchitectures_test.cc
-include $(PROGRAM_H)
-
-# Program for testing ParseDepends
-PROGRAM = ParseDepends${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = parsedepends_test.cc
-include $(PROGRAM_H)
-
-# Program for testing GetListOfFilesInDir
-PROGRAM = GetListOfFilesInDir${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = getlistoffilesindir_test.cc
-include $(PROGRAM_H)
-
-# Program for testing CommandLine reconstruction
-PROGRAM = Commandline${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = commandline_test.cc
-include $(PROGRAM_H)
-
-# Program for testing CommandLine reconstruction
-PROGRAM = CommandlineAsString${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = commandlineasstring_test.cc
-include $(PROGRAM_H)
-
-# Program for testing debians version comparing
-PROGRAM = CompareVersion${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = compareversion_test.cc
-include $(PROGRAM_H)
-
-# test the GlobalError stack class
-PROGRAM = GlobalError${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = globalerror_test.cc
-include $(PROGRAM_H)
-
-# test the different Hashsum classes
-PROGRAM = HashSums${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = hashsums_test.cc
-include $(PROGRAM_H)
-
-# test the strutils stuff
-PROGRAM = StrUtil${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = strutil_test.cc
-include $(PROGRAM_H)
-
-# test the URI parsing stuff
-PROGRAM = URI${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = uri_test.cc
-include $(PROGRAM_H)
-
-# test the Configuration class
-PROGRAM = Configuration${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = configuration_test.cc
-include $(PROGRAM_H)
-
-# test cdroms core FindPackages
-PROGRAM = CdromFindPackages${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = cdromfindpackages_test.cc
-include $(PROGRAM_H)
-
-# test cdroms index reduction for source.list
-PROGRAM = CdromReduceSourceList${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = cdromreducesourcelist_test.cc
-include $(PROGRAM_H)
-
-# test IndexCopy::ConvertToSourceList
-PROGRAM = IndexCopyToSourceList${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = indexcopytosourcelist_test.cc
-
-# test fileutls
-PROGRAM = FileUtl${BASENAME}
-SLIBS = -lapt-pkg 
-SOURCE = fileutl_test.cc
-include $(PROGRAM_H)
-
-# test tagfile
-PROGRAM = PkgTagFile${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = tagfile_test.cc
-include $(PROGRAM_H)
-
-# test sourcelist
-PROGRAM = SourceList${BASENAME}
-SLIBS = -lapt-pkg
-SOURCE = sourcelist_test.cc
-include $(PROGRAM_H)
-
+test: $(BIN)/gtest$(BASENAME)
+	MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=$(LIB) $(BIN)/gtest$(BASENAME)
+
+$(BIN)/gtest$(BASENAME): $(LIB)/gtest.a
+
+PROGRAM = gtest${BASENAME}
+SLIBS = -lapt-pkg -pthread $(LIB)/gtest.a
+LIB_MAKES = apt-pkg/makefile
+SOURCE = gtest_runner.cc $(wildcard *-helpers.cc *_test.cc)
+include $(PROGRAM_H)
+
+
+MKDIRS += $(OBJ) $(LIB)
+LOCAL=gtest
+SOURCE=gtest-all
+gtest-OBJS := $(addprefix $(OBJ)/,$(addsuffix .o,$(SOURCE)))
+
+# The rest of the file is based on the example found in
+# /usr/share/doc/libgtest-dev/examples/make/Makefile
+GTEST_DIR = /usr/src/gtest
+
+# Flags passed to the preprocessor.
+# Set Google Test's header directory as a system directory, such that
+# the compiler doesn't generate warnings in Google Test headers.
+CPPFLAGS += -isystem $(GTEST_DIR)/include
+
+# Flags passed to the C++ compiler.
+CXXFLAGS += -pthread
+# disable some flags for gtest again
+CXXFLAGS+= -Wno-missing-declarations
+CXXFLAGS+= -Wno-missing-field-initializers
+CXXFLAGS+= -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Wno-suggest-attribute=noreturn
+
+# All Google Test headers.  Usually you shouldn't change this definition.
+GTEST_HEADERS = /usr/include/gtest/*.h \
+                /usr/include/gtest/internal/*.h
+
+# House-keeping build targets.
+.PHONY: clean/gtest veryclean/gtest
+clean: clean/gtest
+clean/gtest:
+	rm -f $(gtest-OBJS)
+veryclean: veryclean/gtest
+veryclean/gtest: clean/gtest
+	rm -f $(LIB)/gtest.a
+
+# Usually you shouldn't tweak such internal variables, indicated by a
+# trailing _.
+GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS)
+
+# Builds gtest.a
+# For simplicity and to avoid depending on Google Test's
+# implementation details, the dependencies specified below are
+# conservative and not optimized.  This is fine as Google Test
+# compiles fast and for ordinary users its source rarely changes.
+$(gtest-OBJS): $(GTEST_SRCS_)
+	echo Compiling $@
+	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c -o $@ $(GTEST_DIR)/src/$(notdir $(basename $@)).cc
+
+$(LIB)/gtest.a: $(OBJ)/gtest-all.o
+	echo Building static library $@
+	-rm -f $@
+	$(AR) $(ARFLAGS) $@ $^
diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc
index e95016240..1e0afb66c 100644
--- a/test/libapt/parsedepends_test.cc
+++ b/test/libapt/parsedepends_test.cc
@@ -1,196 +1,244 @@
+#include <config.h>
+
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/pkgcache.h>
+
+#include <string.h>
+#include <string>
+
+#include <gtest/gtest.h>
+
+static void parseDependency(bool const StripMultiArch,  bool const ParseArchFlags, bool const ParseRestrictionsList)
+{
+   std::string Package;
+   std::string Version;
+   unsigned int Op = 5;
+   unsigned int Null = 0;
+   _config->Set("APT::Architecture","amd64");
+   _config->Set("APT::Build-Profiles","stage1");
+
+   const char* Depends =
+      "debhelper:any (>= 5.0), "
+      "libdb-dev:any, "
+      "gettext:native (<= 0.12), "
+      "libcurl4-gnutls-dev:native | libcurl3-gnutls-dev (>> 7.15.5), "
+      "debiandoc-sgml, "
+      "apt (>= 0.7.25), "
+      "not-for-me [ !amd64 ], "
+      "only-for-me [ amd64 ], "
+      "any-for-me [ any ], "
+      "not-for-darwin [ !darwin-any ], "
+      "cpu-for-me [ any-amd64 ], "
+      "os-for-me [ linux-any ], "
+      "cpu-not-for-me [ any-armel ], "
+      "os-not-for-me [ kfreebsd-any ], "
+      "not-in-stage1 <!profile.stage1>, "
+      "not-in-stage1-or-nodoc <!profile.nodoc !profile.stage1>, "
+      "only-in-stage1 <unknown.unknown profile.stage1>, "
+      "overlord-dev:any (= 7.15.3~) | overlord-dev:native (>> 7.15.5), "
+      ;
+
+   // Stripping MultiArch is currently the default setting to not confuse
+   // non-MultiArch capable users of the library with "strange" extensions.
+   const char* Start = Depends;
+   const char* End = Depends + strlen(Depends);
+
+   Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+   if (StripMultiArch == true)
+      EXPECT_EQ("debhelper", Package);
+   else
+      EXPECT_EQ("debhelper:any", Package);
+   EXPECT_EQ("5.0", Version);
+   EXPECT_EQ(Null | pkgCache::Dep::GreaterEq, Op);
+
+   Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+   if (StripMultiArch == true)
+      EXPECT_EQ("libdb-dev", Package);
+   else
+      EXPECT_EQ("libdb-dev:any", Package);
+   EXPECT_EQ("", Version);
+   EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op);
+
+   Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+   if (StripMultiArch == true)
+      EXPECT_EQ("gettext", Package);
+   else
+      EXPECT_EQ("gettext:native", Package);
+   EXPECT_EQ("0.12", Version);
+   EXPECT_EQ(Null | pkgCache::Dep::LessEq, Op);
+
+   Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+   if (StripMultiArch == true)
+      EXPECT_EQ("libcurl4-gnutls-dev", Package);
+   else
+      EXPECT_EQ("libcurl4-gnutls-dev:native", Package);
+   EXPECT_EQ("", Version);
+   EXPECT_EQ(Null | pkgCache::Dep::Or, Op);
+
+   Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+   EXPECT_EQ("libcurl3-gnutls-dev", Package);
+   EXPECT_EQ("7.15.5", Version);
+   EXPECT_EQ(Null | pkgCache::Dep::Greater, Op);
+
+   Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+   EXPECT_EQ("debiandoc-sgml", Package);
+   EXPECT_EQ("", Version);
+   EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op);
+
+   Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+   EXPECT_EQ("apt", Package);
+   EXPECT_EQ("0.7.25", Version);
+   EXPECT_EQ(Null | pkgCache::Dep::GreaterEq, Op);
+
+   if (ParseArchFlags == true) {
+      Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+      EXPECT_EQ("", Package); // not-for-me
+   } else {
+      EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList));
+      Start = strstr(Start, ",");
+      Start++;
+   }
+
+   if (ParseArchFlags == true) {
+      Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+      EXPECT_EQ("only-for-me", Package);
+      EXPECT_EQ("", Version);
+      EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op);
+   } else {
+      EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList));
+      Start = strstr(Start, ",");
+      Start++;
+   }
+
+   if (ParseArchFlags == true) {
+      Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+      EXPECT_EQ("any-for-me", Package);
+      EXPECT_EQ("", Version);
+      EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op);
+   } else {
+      EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList));
+      Start = strstr(Start, ",");
+      Start++;
+   }
+
+   if (ParseArchFlags == true) {
+      Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+      EXPECT_EQ("not-for-darwin", Package);
+      EXPECT_EQ("", Version);
+      EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op);
+   } else {
+      EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList));
+      Start = strstr(Start, ",");
+      Start++;
+   }
+
+   if (ParseArchFlags == true) {
+      Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+      EXPECT_EQ("cpu-for-me", Package);
+      EXPECT_EQ("", Version);
+      EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op);
+   } else {
+      EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList));
+      Start = strstr(Start, ",");
+      Start++;
+   }
+
+   if (ParseArchFlags == true) {
+      Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+      EXPECT_EQ("os-for-me", Package);
+      EXPECT_EQ("", Version);
+      EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op);
+   } else {
+      EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList));
+      Start = strstr(Start, ",");
+      Start++;
+   }
+
+   if (ParseArchFlags == true) {
+      Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+      EXPECT_EQ("", Package); // cpu-not-for-me
+   } else {
+      EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList));
+      Start = strstr(Start, ",");
+      Start++;
+   }
+
+   if (ParseArchFlags == true) {
+      Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+      EXPECT_EQ("", Package); // os-not-for-me
+   } else {
+      EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList));
+      Start = strstr(Start, ",");
+      Start++;
+   }
+
+   if (ParseRestrictionsList == true) {
+      Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+      EXPECT_EQ("", Package); // not-in-stage1
+   } else {
+      EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList));
+      Start = strstr(Start, ",");
+      Start++;
+   }
+
+   if (ParseRestrictionsList == true) {
+      Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+      EXPECT_EQ("", Package); // not-in-stage1-or-in-nodoc
+   } else {
+      EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList));
+      Start = strstr(Start, ",");
+      Start++;
+   }
+
+   if (ParseRestrictionsList == true) {
+      Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+      EXPECT_EQ("only-in-stage1", Package);
+   } else {
+      EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList));
+      Start = strstr(Start, ",");
+      Start++;
+   }
+
+   Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+   if (StripMultiArch == true)
+      EXPECT_EQ("overlord-dev", Package);
+   else
+      EXPECT_EQ("overlord-dev:any", Package);
+   EXPECT_EQ("7.15.3~", Version);
+   EXPECT_EQ(Null | pkgCache::Dep::Equals | pkgCache::Dep::Or, Op);
+
+   debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList);
+   if (StripMultiArch == true)
+      EXPECT_EQ("overlord-dev", Package);
+   else
+      EXPECT_EQ("overlord-dev:native", Package);
+   EXPECT_EQ("7.15.5", Version);
+   EXPECT_EQ(Null | pkgCache::Dep::Greater, Op);
+}
+
+// FIXME: This testcase is too big/complex
+TEST(ParseDependsTest, Everything)
+{
+   bool StripMultiArch = true;
+   bool ParseArchFlags = false;
+   bool ParseRestrictionsList = false;
+   unsigned short runner = 0;
 
-#include "assert.h"
-
-int main(int argc,char *argv[]) {
-	std::string Package;
-	std::string Version;
-	unsigned int Op = 5;
-	unsigned int Null = 0;
-	bool StripMultiArch = true;
-	bool ParseArchFlags = false;
-	_config->Set("APT::Architecture","amd64");
-
-	const char* Depends =
-		"debhelper:any (>= 5.0), "
-		"libdb-dev:any, "
-		"gettext:native (<= 0.12), "
-		"libcurl4-gnutls-dev:native | libcurl3-gnutls-dev (>> 7.15.5), "
-		"debiandoc-sgml, "
-		"apt (>= 0.7.25), "
-		"not-for-me [ !amd64 ], "
-		"only-for-me [ amd64 ], "
-		"any-for-me [ any ], "
-		"not-for-darwin [ !darwin-any ], "
-		"cpu-for-me [ any-amd64 ], "
-		"os-for-me [ linux-any ], "
-		"cpu-not-for-me [ any-armel ], "
-		"os-not-for-me [ kfreebsd-any ], "
-		"overlord-dev:any (= 7.15.3~) | overlord-dev:native (>> 7.15.5), "
-	;
-
-	unsigned short runner = 0;
 test:
-// 	std::clog << (StripMultiArch ? "NO-Multi" : "Multi") << " " << (ParseArchFlags ? "Flags" : "NO-Flags") << std::endl;
-
-	// Stripping MultiArch is currently the default setting to not confuse
-	// non-MultiArch capable users of the library with "strange" extensions.
-	const char* Start = Depends;
-	const char* End = Depends + strlen(Depends);
-
-	Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-	if (StripMultiArch == true)
-		equals("debhelper", Package);
-	else
-		equals("debhelper:any", Package);
-	equals("5.0", Version);
-	equals(Null | pkgCache::Dep::GreaterEq, Op);
-
-	Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-	if (StripMultiArch == true)
-		equals("libdb-dev", Package);
-	else
-		equals("libdb-dev:any", Package);
-	equals("", Version);
-	equals(Null | pkgCache::Dep::NoOp, Op);
-
-	Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-	if (StripMultiArch == true)
-		equals("gettext", Package);
-	else
-		equals("gettext:native", Package);
-	equals("0.12", Version);
-	equals(Null | pkgCache::Dep::LessEq, Op);
-
-	Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-	if (StripMultiArch == true)
-		equals("libcurl4-gnutls-dev", Package);
-	else
-		equals("libcurl4-gnutls-dev:native", Package);
-	equals("", Version);
-	equals(Null | pkgCache::Dep::Or, Op);
-
-	Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-	equals("libcurl3-gnutls-dev", Package);
-	equals("7.15.5", Version);
-	equals(Null | pkgCache::Dep::Greater, Op);
-
-	Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-	equals("debiandoc-sgml", Package);
-	equals("", Version);
-	equals(Null | pkgCache::Dep::NoOp, Op);
-
-	Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-	equals("apt", Package);
-	equals("0.7.25", Version);
-	equals(Null | pkgCache::Dep::GreaterEq, Op);
-
-	if (ParseArchFlags == true) {
-		Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-		equals("", Package); // not-for-me
-	} else {
-		equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch));
-		Start = strstr(Start, ",");
-		Start++;
-	}
-
-	if (ParseArchFlags == true) {
-		Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-		equals("only-for-me", Package);
-		equals("", Version);
-		equals(Null | pkgCache::Dep::NoOp, Op);
-	} else {
-		equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch));
-		Start = strstr(Start, ",");
-		Start++;
-	}
-
-	if (ParseArchFlags == true) {
-		Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-		equals("any-for-me", Package);
-		equals("", Version);
-		equals(Null | pkgCache::Dep::NoOp, Op);
-	} else {
-		equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch));
-		Start = strstr(Start, ",");
-		Start++;
-	}
-
-	if (ParseArchFlags == true) {
-		Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-		equals("not-for-darwin", Package);
-		equals("", Version);
-		equals(Null | pkgCache::Dep::NoOp, Op);
-	} else {
-		equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch));
-		Start = strstr(Start, ",");
-		Start++;
-	}
-
-	if (ParseArchFlags == true) {
-		Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-		equals("cpu-for-me", Package);
-		equals("", Version);
-		equals(Null | pkgCache::Dep::NoOp, Op);
-	} else {
-		equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch));
-		Start = strstr(Start, ",");
-		Start++;
-	}
-
-	if (ParseArchFlags == true) {
-		Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-		equals("os-for-me", Package);
-		equals("", Version);
-		equals(Null | pkgCache::Dep::NoOp, Op);
-	} else {
-		equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch));
-		Start = strstr(Start, ",");
-		Start++;
-	}
-
-	if (ParseArchFlags == true) {
-		Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-		equals("", Package); // cpu-not-for-me
-	} else {
-		equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch));
-		Start = strstr(Start, ",");
-		Start++;
-	}
-
-	if (ParseArchFlags == true) {
-		Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-		equals("", Package); // os-not-for-me
-	} else {
-		equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch));
-		Start = strstr(Start, ",");
-		Start++;
-	}
-
-	Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-	if (StripMultiArch == true)
-		equals("overlord-dev", Package);
-	else
-		equals("overlord-dev:any", Package);
-	equals("7.15.3~", Version);
-	equals(Null | pkgCache::Dep::Equals | pkgCache::Dep::Or, Op);
-
-	debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch);
-	if (StripMultiArch == true)
-		equals("overlord-dev", Package);
-	else
-		equals("overlord-dev:native", Package);
-	equals("7.15.5", Version);
-	equals(Null | pkgCache::Dep::Greater, Op);
-
-	if (StripMultiArch == false)
-		ParseArchFlags = true;
-	StripMultiArch = !StripMultiArch;
-
-	runner++;
-	if (runner < 4)
-		goto test; // this is the prove: tests are really evil ;)
-
-	return 0;
+   {
+      SCOPED_TRACE(std::string("StripMultiArch: ") + (StripMultiArch ? "true" : "false"));
+      SCOPED_TRACE(std::string("ParseArchFlags: ") + (ParseArchFlags ? "true" : "false"));
+      SCOPED_TRACE(std::string("ParseRestrictionsList: ") + (ParseRestrictionsList ? "true" : "false"));
+      parseDependency(StripMultiArch, ParseArchFlags, ParseRestrictionsList);
+   }
+   if (StripMultiArch == false)
+      if (ParseArchFlags == false)
+	 ParseRestrictionsList = !ParseRestrictionsList;
+   ParseArchFlags = !ParseArchFlags;
+   StripMultiArch = !StripMultiArch;
+
+   runner++;
+   if (runner < 8)
+      goto test; // this is the prove: tests are really evil ;)
 }
diff --git a/test/libapt/run-tests b/test/libapt/run-tests
deleted file mode 100755
index a056f31f9..000000000
--- a/test/libapt/run-tests
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/sh
-set -e
-
-DIR=$(readlink -f $(dirname $0))
-if [ -z "$MAKELEVEL" ]; then
-	echo 'Compiling the tests …'
-	(cd $DIR && make)
-	echo 'Running all testcases …'
-fi
-LDPATH="$DIR/../../build/bin"
-EXT="_libapt_test"
-EXIT_CODE=0
-
-# detect if output is on a terminal (colorful) or better not
-if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then
-	COLHIGH='\033[1;35m'
-	COLRESET='\033[0m'
-	TESTOKAY='\033[1;32mOKAY\033[0m'
-	TESTFAIL='\033[1;31mFAILED\033[0m'
-else
-	COLHIGH=''
-	COLRESET=''
-	TESTOKAY='OK'
-	TESTFAIL='###FAILED###'
-fi
-
-for testapp in $(ls ${LDPATH}/*$EXT)
-do
-	name=$(basename ${testapp})
-	NAME="${COLHIGH}${name}${COLRESET}"
-	tmppath=""
-
-	if [ $name = "GetListOfFilesInDir${EXT}" ]; then
-		# TODO: very-low: move env creation to the actual test-app
-		tmppath=$(mktemp -d)
-		touch "${tmppath}/anormalfile" \
-			"${tmppath}/01yet-anothernormalfile" \
-			"${tmppath}/anormalapt.conf" \
-			"${tmppath}/01yet-anotherapt.conf" \
-			"${tmppath}/anormalapt.list" \
-			"${tmppath}/01yet-anotherapt.list" \
-			"${tmppath}/wrongextension.wron" \
-			"${tmppath}/wrong-extension.wron" \
-			"${tmppath}/strangefile." \
-			"${tmppath}/s.t.r.a.n.g.e.f.i.l.e" \
-			"${tmppath}/.hiddenfile" \
-			"${tmppath}/.hiddenfile.conf" \
-			"${tmppath}/.hiddenfile.list" \
-			"${tmppath}/multi..dot" \
-			"${tmppath}/multi.dot.conf" \
-			"${tmppath}/multi.dot.list" \
-			"${tmppath}/disabledfile.disabled" \
-			"${tmppath}/disabledfile.conf.disabled" \
-			"${tmppath}/disabledfile.list.disabled" \
-			"${tmppath}/invälid.conf" \
-			"${tmppath}/invalíd" \
-			"${tmppath}/01invalíd"
-		mkdir "${tmppath}/invaliddir" \
-			"${tmppath}/directory.conf" \
-			"${tmppath}/directory.list" \
-			"${tmppath}/directory.wron" \
-			"${tmppath}/directory.list.disabled"
-		ln -s "${tmppath}/anormalfile" "${tmppath}/linkedfile.list"
-		ln -s "${tmppath}/non-existing-file" "${tmppath}/brokenlink.list"
-	elif [ $name = "getLanguages${EXT}" ]; then
-		tmppath=$(mktemp -d)
-		touch "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tr" \
-			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \
-			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \
-			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" \
-			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-ast_DE" \
-			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tlh%5fDE"
-	elif [ $name = "HashSums${EXT}" ]; then
-		TMP="$(readlink -f "./${0}")"
-		tmppath="$TMP"
-		tmppath="${tmppath} $(md5sum $TMP | cut -d' ' -f 1)"
-		tmppath="${tmppath} $(sha1sum $TMP | cut -d' ' -f 1)"
-		tmppath="${tmppath} $(sha256sum $TMP | cut -d' ' -f 1)"
-		tmppath="${tmppath} $(sha512sum $TMP | cut -d' ' -f 1)"
-	elif [ $name = "CompareVersion${EXT}" ]; then
-		tmppath="${DIR}/versions.lst"
-	elif [ $name = "CdromFindPackages${EXT}" ]; then
-		tmppath=$(mktemp -d)
-		mkdir -p "${tmppath}/.disk" "${tmppath}/pool" \
-			"${tmppath}/dists/stable/main/binary-i386" \
-			"${tmppath}/dists/stable/main/source" \
-			"${tmppath}/dists/stable/contrib/binary-amd64" \
-			"${tmppath}/dists/stable/contrib/binary-all" \
-			"${tmppath}/dists/unstable/main/binary-i386" \
-			"${tmppath}/dists/unstable/main/i18n" \
-			"${tmppath}/dists/unstable/main/source" \
-			"${tmppath}/dists/broken/non-free/source"
-		touch "${tmppath}/dists/broken/.aptignr" \
-			"${tmppath}/dists/stable/main/binary-i386/Packages" \
-			"${tmppath}/dists/stable/main/binary-i386/Packages.bz2" \
-			"${tmppath}/dists/stable/main/source/Sources.xz" \
-			"${tmppath}/dists/stable/contrib/binary-amd64/Packages" \
-			"${tmppath}/dists/stable/contrib/binary-amd64/Packages.gz" \
-			"${tmppath}/dists/stable/contrib/binary-all/Packages" \
-			"${tmppath}/dists/unstable/main/binary-i386/Packages.xz" \
-			"${tmppath}/dists/unstable/main/binary-i386/Packages.lzma" \
-			"${tmppath}/dists/unstable/main/i18n/Translation-en" \
-			"${tmppath}/dists/unstable/main/i18n/Translation-de.bz2" \
-			"${tmppath}/dists/unstable/main/source/Sources.xz" \
-			"${tmppath}/dists/broken/non-free/source/Sources.gz" \
-			"${tmppath}/dists/stable/Release.gpg" \
-			"${tmppath}/dists/stable/Release" \
-			"${tmppath}/dists/unstable/InRelease" \
-			"${tmppath}/dists/broken/Release.gpg"
-		ln -s "${tmppath}/dists/unstable" "${tmppath}/dists/sid"
-	fi
-
-	echo -n "Testing with ${NAME} "
-	if MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} ; then
-		echo "$TESTOKAY"
-	else
-		echo "$TESTFAIL"
-		EXIT_CODE=1
-	fi
-
-	if [ -n "$tmppath" -a -d "$tmppath" ]; then
-		rm -rf "$tmppath"
-	fi
-done
-exit $EXIT_CODE
diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc
index 0300ce929..eb2d76c43 100644
--- a/test/libapt/sourcelist_test.cc
+++ b/test/libapt/sourcelist_test.cc
@@ -1,29 +1,27 @@
+#include <config.h>
+
 #include <apt-pkg/sourcelist.h>
-#include <apt-pkg/tagfile.h>
+#include <apt-pkg/fileutl.h>
 
-#include "assert.h"
+#include <string>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-char *tempfile = NULL;
-int tempfile_fd = -1;
+#include <gtest/gtest.h>
 
-void remove_tmpfile(void)
-{
-   if (tempfile_fd > 0)
-      close(tempfile_fd);
-   if (tempfile != NULL) {
-      unlink(tempfile);
-      free(tempfile);
-   }
-}
+#include "file-helpers.h"
 
-int main(int argc, char *argv[])
-{
-  _config->Set("APT::Sources::Use-Deb822", true);
+class SourceList : public pkgSourceList {
+   public:
+      using pkgSourceList::ParseFileDeb822;
+};
 
-   const char contents[] = ""
+TEST(SourceListTest,ParseFileDeb822)
+{
+   FileFd fd;
+   char * tempfile;
+   createTemporaryFile("parsefiledeb822", fd, &tempfile,
       "Types: deb\n"
       "URIs: http://ftp.debian.org/debian\n"
       "Suites: stable\n"
@@ -34,22 +32,12 @@ int main(int argc, char *argv[])
       "Types: deb\n"
       "URIs: http://ftp.debian.org/debian\n"
       "Suites: unstable\n"
-      "Sections: main non-free\n"
-      ;
-
-   FileFd fd;
-   atexit(remove_tmpfile);
-   tempfile = strdup("apt-test.XXXXXXXX");
-   tempfile_fd = mkstemp(tempfile);
-
-   /* (Re-)Open (as FileFd), write and seek to start of the temp file */
-   equals(fd.OpenDescriptor(tempfile_fd, FileFd::ReadWrite), true);
-   equals(fd.Write(contents, strlen(contents)), true);
-   equals(fd.Seek(0), true);
+      "Sections: main non-free\n");
+   fd.Close();
 
-   pkgSourceList sources(tempfile);
-   equals(sources.size(), 2);
+   SourceList sources;
+   EXPECT_EQ(2, sources.ParseFileDeb822(tempfile));
+   EXPECT_EQ(2, sources.size());
 
-   /* clean up handled by atexit handler, so just return here */
-   return 0;
+   unlink(tempfile);
 }
diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc
index 8215654d0..bc004fd66 100644
--- a/test/libapt/strutil_test.cc
+++ b/test/libapt/strutil_test.cc
@@ -1,91 +1,72 @@
+#include <config.h>
 #include <apt-pkg/strutl.h>
+#include <string>
+#include <vector>
 
-#include "assert.h"
+#include <gtest/gtest.h>
 
-int main(int argc,char *argv[])
+TEST(StrUtilTest,DeEscapeString)
 {
-   std::string input, output, expected;
-
-   // no input
-   input = "foobar";
-   expected = "foobar";
-   output = DeEscapeString(input);
-   equals(output, expected);
-
+   // nothing special
+   EXPECT_EQ("", DeEscapeString(""));
+   EXPECT_EQ("foobar", DeEscapeString("foobar"));
    // hex and octal
-   input = "foo\\040bar\\x0abaz";
-   expected = "foo bar\nbaz";
-   output = DeEscapeString(input);
-   equals(output, expected);
-
-   // at the end
-   input = "foo\\040";
-   expected = "foo ";
-   output = DeEscapeString(input);
-   equals(output, expected);
-
-   // double escape
-   input = "foo\\\\ x";
-   expected = "foo\\ x";
-   output = DeEscapeString(input);
-   equals(output, expected);
-
-   // double escape at the end
-   input = "\\\\foo\\\\";
-   expected = "\\foo\\";
-   output = DeEscapeString(input);
-   equals(output, expected);
+   EXPECT_EQ("foo bar\nbaz", DeEscapeString("foo\\040bar\\x0abaz"));
+   EXPECT_EQ("foo ", DeEscapeString("foo\\040"));
+   EXPECT_EQ("\nbaz", DeEscapeString("\\x0abaz"));
+   EXPECT_EQ("/media/Ubuntu 11.04 amd64", DeEscapeString("/media/Ubuntu\\04011.04\\040amd64"));
+   // double slashes
+   EXPECT_EQ("foo\\ x", DeEscapeString("foo\\\\ x"));
+   EXPECT_EQ("\\foo\\", DeEscapeString("\\\\foo\\\\"));
+}
+TEST(StrUtilTest,StringSplitBasic)
+{
+   std::vector<std::string> result = StringSplit("", "");
+   EXPECT_EQ(result.size(), 0);
 
-   // the string that we actually need it for
-   input = "/media/Ubuntu\\04011.04\\040amd64";
-   expected = "/media/Ubuntu 11.04 amd64";
-   output = DeEscapeString(input);
-   equals(output, expected);
+   result = StringSplit("abc", "");
+   EXPECT_EQ(result.size(), 0);
 
-   // Split
-   input = "status: libnet1:amd64: unpacked";
-   vector<std::string> result = StringSplit(input, ": ");
-   equals(result[0], "status");
-   equals(result[1], "libnet1:amd64");
-   equals(result[2], "unpacked");
-   equals(result.size(), 3);
+   result = StringSplit("", "abc");
+   EXPECT_EQ(result.size(), 1);
 
-   input = "status: libnet1:amd64: unpacked";
-   result = StringSplit(input, "xxx");
-   equals(result[0], input);
-   equals(result.size(), 1);
+   result = StringSplit("abc", "b");
+   ASSERT_EQ(result.size(), 2);
+   EXPECT_EQ(result[0], "a");
+   EXPECT_EQ(result[1], "c");
 
-   input = "status: libnet1:amd64: unpacked";
-   result = StringSplit(input, "");
-   equals(result.size(), 0);
-
-   input = "x:y:z";
-   result = StringSplit(input, ":", 2);
-   equals(result.size(), 2);
-   equals(result[0], "x");
-   equals(result[1], "y:z");
+   result = StringSplit("abc", "abc");
+   ASSERT_EQ(result.size(), 2);
+   EXPECT_EQ(result[0], "");
+   EXPECT_EQ(result[1], "");
+}
+TEST(StrUtilTest,StringSplitDpkgStatus)
+{
+   std::string const input = "status: libnet1:amd64: unpacked";
+   std::vector<std::string> result = StringSplit(input, "xxx");
+   ASSERT_EQ(result.size(), 1);
+   EXPECT_EQ(result[0], input);
 
-   input = "abc";
    result = StringSplit(input, "");
-   equals(result.size(), 0);
-
-   // endswith
-   bool b;
-   input = "abcd";
-   b = APT::String::Endswith(input, "d");
-   equals(b, true);
-
-   b = APT::String::Endswith(input, "cd");
-   equals(b, true);
-
-   b = APT::String::Endswith(input, "abcd");
-   equals(b, true);
-
-   b = APT::String::Endswith(input, "x");
-   equals(b, false);
-
-   b = APT::String::Endswith(input, "abcndefg");
-   equals(b, false);
-
-   return 0;
+   EXPECT_EQ(result.size(), 0);
+
+   result = StringSplit(input, ": ");
+   ASSERT_EQ(result.size(), 3);
+   EXPECT_EQ(result[0], "status");
+   EXPECT_EQ(result[1], "libnet1:amd64");
+   EXPECT_EQ(result[2], "unpacked");
+
+   result = StringSplit("x:y:z", ":", 2);
+   ASSERT_EQ(result.size(), 2);
+   EXPECT_EQ(result[0], "x");
+   EXPECT_EQ(result[1], "y:z");
+}
+TEST(StrUtilTest,EndsWith)
+{
+   using APT::String::Endswith;
+   EXPECT_TRUE(Endswith("abcd", "d"));
+   EXPECT_TRUE(Endswith("abcd", "cd"));
+   EXPECT_TRUE(Endswith("abcd", "abcd"));
+   EXPECT_FALSE(Endswith("abcd", "x"));
+   EXPECT_FALSE(Endswith("abcd", "abcndefg"));
 }
diff --git a/test/libapt/tagfile_test.cc b/test/libapt/tagfile_test.cc
index d12c74c95..1bac75b55 100644
--- a/test/libapt/tagfile_test.cc
+++ b/test/libapt/tagfile_test.cc
@@ -1,58 +1,36 @@
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/tagfile.h>
 
-#include "assert.h"
+#include <string>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-char *tempfile = NULL;
-int tempfile_fd = -1;
+#include <gtest/gtest.h>
 
-void remove_tmpfile(void)
-{
-   if (tempfile_fd > 0)
-      close(tempfile_fd);
-   if (tempfile != NULL) {
-      unlink(tempfile);
-      free(tempfile);
-   }
-}
+#include "file-helpers.h"
 
-int main(int argc, char *argv[])
+TEST(TagFileTest,SingleField)
 {
    FileFd fd;
-   const char contents[] = "FieldA-12345678: the value of the field";
-   atexit(remove_tmpfile);
-   tempfile = strdup("apt-test.XXXXXXXX");
-   tempfile_fd = mkstemp(tempfile);
-
-   /* (Re-)Open (as FileFd), write and seek to start of the temp file */
-   equals(fd.OpenDescriptor(tempfile_fd, FileFd::ReadWrite), true);
-   equals(fd.Write(contents, strlen(contents)), true);
-   equals(fd.Seek(0), true);
+   createTemporaryFile("singlefield", fd, NULL, "FieldA-12345678: the value of the field");
 
    pkgTagFile tfile(&fd);
    pkgTagSection section;
-   equals(tfile.Step(section), true);
-  
-   /* It has one field */
-   equals(section.Count(), 1);
-
-   /* ... and it is called FieldA-12345678 */
-   equals(section.Exists("FieldA-12345678"), true);
-
-   /* its value is correct */
-   equals(section.FindS("FieldA-12345678"), std::string("the value of the field"));
-   /* A non-existent field has an empty string as value */
-   equals(section.FindS("FieldB-12345678"), std::string());
-
-   /* ... and Exists does not lie about missing fields... */
-   equalsNot(section.Exists("FieldB-12345678"), true); 
-
-   /* There is only one section in this tag file */
-   equals(tfile.Step(section), false);
-
-   /* clean up handled by atexit handler, so just return here */
-   return 0;
+   ASSERT_TRUE(tfile.Step(section));
+
+   // It has one field
+   EXPECT_EQ(1, section.Count());
+   // ... and it is called FieldA-12345678
+   EXPECT_TRUE(section.Exists("FieldA-12345678"));
+   // its value is correct
+   EXPECT_EQ("the value of the field", section.FindS("FieldA-12345678"));
+   // A non-existent field has an empty string as value
+   EXPECT_EQ("", section.FindS("FieldB-12345678"));
+   // ... and Exists does not lie about missing fields...
+   EXPECT_FALSE(section.Exists("FieldB-12345678"));
+   // There is only one section in this tag file
+   EXPECT_FALSE(tfile.Step(section));
 }
diff --git a/test/libapt/uri_test.cc b/test/libapt/uri_test.cc
index 8216ade71..1662f51f0 100644
--- a/test/libapt/uri_test.cc
+++ b/test/libapt/uri_test.cc
@@ -1,120 +1,119 @@
+#include <config.h>
 #include <apt-pkg/strutl.h>
+#include <string>
+#include <gtest/gtest.h>
 
-#include "assert.h"
-
-int main() {
-	// Basic stuff
-	{
-	URI U("http://www.debian.org:90/temp/test");
-	equals("http", U.Access);
-	equals("", U.User);
-	equals("", U.Password);
-	equals(90, U.Port);
-	equals("www.debian.org", U.Host);
-	equals("/temp/test", U.Path);
-	} {
-	URI U("http://jgg:foo@ualberta.ca/blah");
-	equals("http", U.Access);
-	equals("jgg", U.User);
-	equals("foo", U.Password);
-	equals(0, U.Port);
-	equals("ualberta.ca", U.Host);
-	equals("/blah", U.Path);
-	} {
-	URI U("file:/usr/bin/foo");
-	equals("file", U.Access);
-	equals("", U.User);
-	equals("", U.Password);
-	equals(0, U.Port);
-	equals("", U.Host);
-	equals("/usr/bin/foo", U.Path);
-	} {
-	URI U("cdrom:Moo Cow Rom:/debian");
-	equals("cdrom", U.Access);
-	equals("", U.User);
-	equals("", U.Password);
-	equals(0, U.Port);
-	equals("Moo Cow Rom", U.Host);
-	equals("/debian", U.Path);
-	} {
-	URI U("gzip:./bar/cow");
-	equals("gzip", U.Access);
-	equals("", U.User);
-	equals("", U.Password);
-	equals(0, U.Port);
-	equals(".", U.Host);
-	equals("/bar/cow", U.Path);
-	} {
-	URI U("ftp:ftp.fr.debian.org/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb");
-	equals("ftp", U.Access);
-	equals("", U.User);
-	equals("", U.Password);
-	equals(0, U.Port);
-	equals("ftp.fr.debian.org", U.Host);
-	equals("/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb", U.Path);
-	}
-
-	// RFC 2732 stuff
-	{
-	URI U("http://[1080::8:800:200C:417A]/foo");
-	equals("http", U.Access);
-	equals("", U.User);
-	equals("", U.Password);
-	equals(0, U.Port);
-	equals("1080::8:800:200C:417A", U.Host);
-	equals("/foo", U.Path);
-	} {
-	URI U("http://[::FFFF:129.144.52.38]:80/index.html");
-	equals("http", U.Access);
-	equals("", U.User);
-	equals("", U.Password);
-	equals(80, U.Port);
-	equals("::FFFF:129.144.52.38", U.Host);
-	equals("/index.html", U.Path);
-	} {
-	URI U("http://[::FFFF:129.144.52.38:]:80/index.html");
-	equals("http", U.Access);
-	equals("", U.User);
-	equals("", U.Password);
-	equals(80, U.Port);
-	equals("::FFFF:129.144.52.38:", U.Host);
-	equals("/index.html", U.Path);
-	} {
-	URI U("http://[::FFFF:129.144.52.38:]/index.html");
-	equals("http", U.Access);
-	equals("", U.User);
-	equals("", U.Password);
-	equals(0, U.Port);
-	equals("::FFFF:129.144.52.38:", U.Host);
-	equals("/index.html", U.Path);
-	}
-	/* My Evil Corruption of RFC 2732 to handle CDROM names! Fun for
-	   the whole family! */
-	{
-	URI U("cdrom:[The Debian 1.2 disk, 1/2 R1:6]/debian/");
-	equals("cdrom", U.Access);
-	equals("", U.User);
-	equals("", U.Password);
-	equals(0, U.Port);
-	equals("The Debian 1.2 disk, 1/2 R1:6", U.Host);
-	equals("/debian/", U.Path);
-	} {
-	URI U("cdrom:Foo Bar Cow/debian/");
-	equals("cdrom", U.Access);
-	equals("", U.User);
-	equals("", U.Password);
-	equals(0, U.Port);
-	equals("Foo Bar Cow", U.Host);
-	equals("/debian/", U.Path);
-	}
-
-        // Percent-encoding.
-        {
-        URI U("ftp://foo:b%40r@example.org");
-        equals("foo", U.User);
-        equals("b@r", U.Password);
-        equals("ftp://foo:b%40r@example.org/", (std::string) U);
-        }
-
-	return 0;
+TEST(URITest, BasicHTTP)
+{
+   URI U("http://www.debian.org:90/temp/test");
+   EXPECT_EQ("http", U.Access);
+   EXPECT_EQ("", U.User);
+   EXPECT_EQ("", U.Password);
+   EXPECT_EQ(90, U.Port);
+   EXPECT_EQ("www.debian.org", U.Host);
+   EXPECT_EQ("/temp/test", U.Path);
+   // Login data
+   U = URI("http://jgg:foo@ualberta.ca/blah");
+   EXPECT_EQ("http", U.Access);
+   EXPECT_EQ("jgg", U.User);
+   EXPECT_EQ("foo", U.Password);
+   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ("ualberta.ca", U.Host);
+   EXPECT_EQ("/blah", U.Path);
+}
+TEST(URITest, SingeSlashFile)
+{
+   URI U("file:/usr/bin/foo");
+   EXPECT_EQ("file", U.Access);
+   EXPECT_EQ("", U.User);
+   EXPECT_EQ("", U.Password);
+   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ("", U.Host);
+   EXPECT_EQ("/usr/bin/foo", U.Path);
+}
+TEST(URITest, BasicCDROM)
+{
+   URI U("cdrom:Moo Cow Rom:/debian");
+   EXPECT_EQ("cdrom", U.Access);
+   EXPECT_EQ("", U.User);
+   EXPECT_EQ("", U.Password);
+   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ("Moo Cow Rom", U.Host);
+   EXPECT_EQ("/debian", U.Path);
+}
+TEST(URITest, RelativeGzip)
+{
+   URI U("gzip:./bar/cow");
+   EXPECT_EQ("gzip", U.Access);
+   EXPECT_EQ("", U.User);
+   EXPECT_EQ("", U.Password);
+   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ(".", U.Host);
+   EXPECT_EQ("/bar/cow", U.Path);
+}
+TEST(URITest, NoSlashFTP)
+{
+   URI U("ftp:ftp.fr.debian.org/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb");
+   EXPECT_EQ("ftp", U.Access);
+   EXPECT_EQ("", U.User);
+   EXPECT_EQ("", U.Password);
+   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ("ftp.fr.debian.org", U.Host);
+   EXPECT_EQ("/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb", U.Path);
+}
+TEST(URITest, RFC2732)
+{
+   URI U("http://[1080::8:800:200C:417A]/foo");
+   EXPECT_EQ("http", U.Access);
+   EXPECT_EQ("", U.User);
+   EXPECT_EQ("", U.Password);
+   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ("1080::8:800:200C:417A", U.Host);
+   EXPECT_EQ("/foo", U.Path);
+   // with port
+   U = URI("http://[::FFFF:129.144.52.38]:80/index.html");
+   EXPECT_EQ("http", U.Access);
+   EXPECT_EQ("", U.User);
+   EXPECT_EQ("", U.Password);
+   EXPECT_EQ(80, U.Port);
+   EXPECT_EQ("::FFFF:129.144.52.38", U.Host);
+   EXPECT_EQ("/index.html", U.Path);
+   // extra colon
+   U = URI("http://[::FFFF:129.144.52.38:]:80/index.html");
+   EXPECT_EQ("http", U.Access);
+   EXPECT_EQ("", U.User);
+   EXPECT_EQ("", U.Password);
+   EXPECT_EQ(80, U.Port);
+   EXPECT_EQ("::FFFF:129.144.52.38:", U.Host);
+   EXPECT_EQ("/index.html", U.Path);
+   // extra colon port
+   U = URI("http://[::FFFF:129.144.52.38:]/index.html");
+   EXPECT_EQ("http", U.Access);
+   EXPECT_EQ("", U.User);
+   EXPECT_EQ("", U.Password);
+   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ("::FFFF:129.144.52.38:", U.Host);
+   EXPECT_EQ("/index.html", U.Path);
+   // My Evil Corruption of RFC 2732 to handle CDROM names!
+   // Fun for the whole family! */
+   U = URI("cdrom:[The Debian 1.2 disk, 1/2 R1:6]/debian/");
+   EXPECT_EQ("cdrom", U.Access);
+   EXPECT_EQ("", U.User);
+   EXPECT_EQ("", U.Password);
+   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ("The Debian 1.2 disk, 1/2 R1:6", U.Host);
+   EXPECT_EQ("/debian/", U.Path);
+   // no brackets
+   U = URI("cdrom:Foo Bar Cow/debian/");
+   EXPECT_EQ("cdrom", U.Access);
+   EXPECT_EQ("", U.User);
+   EXPECT_EQ("", U.Password);
+   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ("Foo Bar Cow", U.Host);
+   EXPECT_EQ("/debian/", U.Path);
+   // percent encoded
+   U = URI("ftp://foo:b%40r@example.org");
+   EXPECT_EQ("foo", U.User);
+   EXPECT_EQ("b@r", U.Password);
+   EXPECT_EQ("ftp://foo:b%40r@example.org/", (std::string) U);
 }
diff --git a/test/libapt/versions.lst b/test/libapt/versions.lst
deleted file mode 100644
index 8dd8ebdc9..000000000
--- a/test/libapt/versions.lst
+++ /dev/null
@@ -1,106 +0,0 @@
-# List of 
-#   ver1 ver2 ret 
-# Of versions worth testing
-#  1 means that ver1 > ver2
-# -1 means that ver1 < ver2
-#  0 means that ver1 = ver2
-7.6p2-4 7.6-0 1
-1.0.3-3 1.0-1 1
-1.3 1.2.2-2 1
-1.3 1.2.2 1
-
-# Important attributes
-# disabled as dpkg --compare-versions doesn't like them… (versions have to start with a number)
-#- . -1
-#p - -1
-#a - -1
-#z - -1
-#a . -1
-#z . -1
-
-# disabled as dpkg --compare-versions doesn't like them… (versions have to start with a number)
-#III-alpha9.8 III-alpha9.8-1.5 -1
-
-# Epochs
-1:0.4 10.3 1
-1:1.25-4 1:1.25-8 -1
-0:1.18.36 1.18.36 0
-
-# native version
-1.18.36 1.18.35 1
-0:1.18.36 1.18.35 1
-
-# Funky, but allowed, characters in upstream version
-9:1.18.36:5.4-20 10:0.5.1-22 -1
-9:1.18.36:5.4-20 9:1.18.36:5.5-1 -1
-9:1.18.36:5.4-20 9:1.18.37:4.3-22 -1
-1.18.36-0.17.35-18 1.18.36-19 1
-
-# Junk
-1:1.2.13-3 1:1.2.13-3.1 -1
-2.0.7pre1-4 2.0.7r-1 -1
-
-# Test some properties of text strings
-0-pre 0-pre 0
-0-pre 0-pree -1
-
-1.1.6r2-2 1.1.6r-1 1
-2.6b2-1 2.6b-2 1
-
-98.1p5-1 98.1-pre2-b6-2 -1
-0.4a6-2 0.4-1 1
-
-1:3.0.5-2 1:3.0.5.1 -1
-
-# #205960
-3.0~rc1-1 3.0-1 -1
-
-# #573592 - debian policy 5.6.12
-1.0 1.0-0 0
-0.2 1.0-0 -1
-1.0 1.0-0+b1 -1
-1.0 1.0-0~ 1
-
-# if a version includes a dash
-# it should be the debrev dash - policy says so…
-0:0-0-0 0-0 1
-
-# do we like strange versions? Yes we like strange versions…
-0 0 0
-0 00 0
-
-# "steal" the testcases from cupt
-1.2.3 1.2.3 0 # identical
-4.4.3-2 4.4.3-2 0 # identical
-1:2ab:5 1:2ab:5 0 # this is correct...
-7:1-a:b-5 7:1-a:b-5 0 # and this
-57:1.2.3abYZ+~-4-5 57:1.2.3abYZ+~-4-5 0 # and those too
-1.2.3 0:1.2.3 0 # zero epoch
-1.2.3 1.2.3-0 0 # zero revision
-009 9 0 # zeroes...
-009ab5 9ab5 0 # there as well
-1.2.3 1.2.3-1 -1 # added non-zero revision
-1.2.3 1.2.4 -1 # just bigger
-1.2.4 1.2.3 1 # order doesn't matter
-1.2.24 1.2.3 1 # bigger, eh?
-0.10.0 0.8.7 1 # bigger, eh?
-3.2 2.3 1 # major number rocks
-1.3.2a 1.3.2 1 # letters rock
-0.5.0~git 0.5.0~git2 -1 # numbers rock
-2a 21 -1 # but not in all places
-1.3.2a 1.3.2b -1 # but there is another letter
-1:1.2.3 1.2.4 1 # epoch rocks
-1:1.2.3 1:1.2.4 -1 # bigger anyway
-1.2a+~bCd3 1.2a++ -1 # tilde doesn't rock
-1.2a+~bCd3 1.2a+~ 1 # but first is longer!
-5:2 304-2 1 # epoch rocks
-5:2 304:2 -1 # so big epoch?
-25:2 3:2 1 # 25 > 3, obviously
-1:2:123 1:12:3 -1 # 12 > 2
-1.2-5 1.2-3-5 -1 # 1.2 < 1.2-3
-5.10.0 5.005 1 # preceding zeroes don't matters
-3a9.8 3.10.2 -1 # letters are before all letter symbols
-3a9.8 3~10 1 # but after the tilde
-1.4+OOo3.0.0~ 1.4+OOo3.0.0-4 -1 # another tilde check
-2.4.7-1 2.4.7-z -1 # revision comparing
-1.002-1+b2 1.00 1 # whatever...
diff --git a/vendor/README b/vendor/README
new file mode 100644
index 000000000..c2fabbd4c
--- /dev/null
+++ b/vendor/README
@@ -0,0 +1,66 @@
+The vendor system in APT is an experiment to help distributions ship a stock
+apt release instead of applying documentation patches to it, increasing
+maintenance burden for everyone and hiding 'interesting' patches in the mix.
+
+The provided information is used in the apt-key script and in documentation
+like manpages and example configuration files. If you have patches modifying
+additional bits and pieces currently not covered by this system please
+contact us so we can change this!
+
+
+== Adding a new vendor
+
+In the same directory you found this README in you should create a new
+directory with the name of your distribution (as defined by dpkg-vendor,
+ e.g. via "dpkg-vendor --query Vendor"). The name is case-insensitive,
+but ensure that the name is otherwise correct and the other fields in
+your deb-origin(5) file are correct as well as our buildsystem relies on
+this information.
+
+If no information is found for the current vendor at buildtime, the system
+looks for a vendor the current vendor is a derivative of, falling back to
+Debian if all else fails.
+
+The directory should include 2 files at the moment. It is best to look
+at the files of other distributions to understand what values are to be
+expected. Some additional notes about them can be found below.
+
+If we happen to include new fields/files in this system, we will opt for
+using a sensible default rather than failing the build or similar, so
+you are recommend to watch this space.
+Ensure also that your information is up-to-date!
+
+Contributing a new vendor as well as updating a existing one is best done
+by opening a bug in the Debian BTS against apt with a patch attached.
+
+
+== apt-vendor.ent
+
+The format used is the one DocBook XML uses. The file is included as an
+entity file in the manpages xml source, so the syntax has to be valid!
+
+The keyring-* settings are additionally used also in the creation of the
+apt-key script and the keyring-package in particular as a dependency for apt.
+
+The field current-codename is optional and can be used in sources.list.in.
+
+
+== sources.list.in
+
+An example for a sources.list which will be shipped in /usr/share/doc.
+This file will NOT be installed in /etc or otherwise used by apt.
+
+You can use some placeholders in this file, namely:
+* &debian-stable-codename;
+* &debian-oldstable-codename;
+* &debian-testing-codename;
+* &ubuntu-codename;
+with the value you would expect based on the name.
+
+The placeholder &current-codename; is yours and can be set in apt-vendor.ent
+
+
+== apt.conf-*
+
+Files in your vendor directory following this naming scheme will be picked up
+by the debian/rules file and installed in /etc/apt/apt.conf.d/ directory.
diff --git a/vendor/blankon/apt-vendor.ent b/vendor/blankon/apt-vendor.ent
new file mode 100644
index 000000000..2600eb715
--- /dev/null
+++ b/vendor/blankon/apt-vendor.ent
@@ -0,0 +1,8 @@
+<!-- details about the keys used by the distribution -->
+<!ENTITY keyring-distro "BlankOn">
+<!ENTITY keyring-package "<package>blankon-keyring</package>">
+<!ENTITY keyring-filename "<filename>/usr/share/keyrings/blankon-archive-keyring.gpg</filename>">
+<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/blankon-archive-removed-keys.gpg</filename>">
+<!ENTITY keyring-master-filename "/usr/share/keyrings/blankon-master-keyring.gpg">
+<!ENTITY keyring-uri "http://arsip.blankonlinux.or.id/blankon/project/blankon-archive-keyring.gpg">
+<!ENTITY current-codename "tambora">
diff --git a/vendor/blankon/sources.list.in b/vendor/blankon/sources.list.in
new file mode 100644
index 000000000..2322e974d
--- /dev/null
+++ b/vendor/blankon/sources.list.in
@@ -0,0 +1,10 @@
+# See sources.list(5) manpage for more information
+# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
+deb http://arsip.blankonlinux.or.id/blankon &current-codename; main restricted
+deb-src http://arsip.blankonlinux.or.id/blankon &current-codename; main restricted
+
+deb http://arsip.blankonlinux.or.id/blankon &current-codename;-security main restricted
+deb-src http://arsip.blankonlinux.or.id/blankon &current-codename;-security main restricted
+
+deb http://arsip.blankonlinux.or.id/blankon &current-codename;-updates main restricted
+deb-src http://arsip.blankonlinux.or.id/blankon &current-codename;-updates main restricted
diff --git a/vendor/debian/makefile b/vendor/debian/makefile
deleted file mode 100644
index 25bc0350c..000000000
--- a/vendor/debian/makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- make -*-
-BASE=../..
-SUBDIR=vendor/debian
-
-# Bring in the default rules
-include ../../buildlib/defaults.mak
-
-doc binary manpages: sources.list
-
-sources.list: sources.list.in ../../doc/apt-verbatim.ent
-	sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@
-
-clean: clean/sources.list
-
-clean/sources.list:
-	rm -f sources.list
-
diff --git a/vendor/debian/sources.list.in b/vendor/debian/sources.list.in
index 745e32cbe..2e430296a 100644
--- a/vendor/debian/sources.list.in
+++ b/vendor/debian/sources.list.in
@@ -1,8 +1,8 @@
 # See sources.list(5) manpage for more information
 # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
-deb http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
-deb http://security.debian.org &stable-codename;/updates main contrib non-free
+deb http://ftp.us.debian.org/debian &debian-stable-codename; main contrib non-free
+deb http://security.debian.org &debian-stable-codename;/updates main contrib non-free
 
 # Uncomment if you want the apt-get source function to work
-#deb-src http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
-#deb-src http://security.debian.org &stable-codename;/updates main contrib non-free
+#deb-src http://ftp.us.debian.org/debian &debian-stable-codename; main contrib non-free
+#deb-src http://security.debian.org &debian-stable-codename;/updates main contrib non-free
diff --git a/vendor/getinfo b/vendor/getinfo
index 4422f5d78..d45c0fca2 100755
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -3,6 +3,7 @@
 
 BASEDIR="$(readlink -f "$(dirname $0)")"
 INFO="$(readlink -f "${BASEDIR}/current/apt-vendor.ent")"
+VERBATIM="${BASEDIR}/../doc/apt-verbatim.ent"
 
 if [ -z "$INFO" ] || [ ! -e "$INFO" ]; then
 	echo >&2 'The current vendor is not valid or not chosen by the buildsystem yet.'
@@ -20,17 +21,20 @@ getfield() {
 }
 
 case "$1" in
-debian-stable-codename)
-	getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
-	;;
-tanglu-codename)
-	getrawfield 'tanglu-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
+debian-stable-codename|debian-oldstable-codename|debian-testing-codename)
+	getrawfield "${1#*-}" "$VERBATIM"
 	;;
 ubuntu-codename)
-	getrawfield 'ubuntu-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
+	getrawfield "$1" "$VERBATIM"
+	;;
+keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-codename)
+	exec $0 'vendor' "$@"
+	;;
+vendor)
+	getfield "$2"
 	;;
-keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-distro-codename)
-	getfield "$1"
+verbatim)
+	getfield "$2" "$VERBATIM"
 	;;
 *)
 	echo >&2 "Unknown data field $1 requested"
diff --git a/vendor/makefile b/vendor/makefile
index 619c603fb..0701a03eb 100644
--- a/vendor/makefile
+++ b/vendor/makefile
@@ -14,11 +14,9 @@ veryclean: veryclean/subdirs
 dirs: dirs/subdirs
 manpages: manpages/subdirs
 
-all/subdirs binary/subdirs doc/subdirs dirs/subdirs manpages/subdirs:
-	$(MAKE) -C current $(patsubst %/subdirs,%,$@)
-
-clean/subdirs veryclean/subdirs:
-	test ! -e current || $(MAKE) -C current $(patsubst %/subdirs,%,$@)
+all/subdirs binary/subdirs doc/subdirs dirs/subdirs manpages/subdirs clean/subdirs veryclean/subdirs:
+	test ! -e current/makefile || $(MAKE) -C current $(patsubst %/subdirs,%,$@)
+	test ! -e current/makefile.auto || $(MAKE) -C current -f makefile.auto $(patsubst %/subdirs,%,$@)
 
 current:
 	rm -f $@
@@ -29,17 +27,29 @@ current:
 			break; \
 		fi; \
 	done
-	# if we haven't found a specific, look for a deriving in hardcoded order
-	test -e $@ || \
-		(dpkg-vendor --derives-from ubuntu && cp ln -s ubuntu $@ ) || \
-		(dpkg-vendor --derives-from tanglu && cp ln -s tanglu $@ ) || \
-		ln -s debian $@
+	# if we haven't found a specific, look for a deriving
+	# we do ubuntu and debian last as those are the biggest families
+	# and would therefore potentially 'shadow' smaller families
+	# (especially debian as it sorts quiet early)
+	if ! test -e $@; then \
+		find -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2 | while read DISTRO; do \
+			if [ "$$DISTRO" = 'debian' -o "$$DISTRO" = 'ubuntu' ]; then continue; fi; \
+			if dpkg-vendor --derives-from $$DISTRO; then \
+				ln -s $$DISTRO $@; \
+				break; \
+			fi; \
+		done; \
+		test -e $@ || \
+			(dpkg-vendor --derives-from ubuntu && cp ln -s ubuntu $@ ) || \
+			ln -s debian $@; \
+	fi
+	if test ! -e current/makefile; then \
+		sed "s#@@VENDOR@@#$(notdir $(shell readlink -f current))#" vendor.makefile > current/makefile.auto; \
+	fi
 
 .PHONY: clean veryclean all binary vendor
-.NOPARALLEL:
 
 clean: clean/current
 
-clean/current:
-	test ! -e current || $(MAKE) -C current clean
-	rm -f current
+clean/current: clean/subdirs
+	rm -f current/makefile.auto current
diff --git a/vendor/raspbian/makefile b/vendor/raspbian/makefile
deleted file mode 100644
index c4464900f..000000000
--- a/vendor/raspbian/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- make -*-
-BASE=../..
-SUBDIR=vendor/raspbian
-
-# Bring in the default rules
-include ../../buildlib/defaults.mak
-
-doc binary manpages: sources.list
-
-sources.list: sources.list.in ../../doc/apt-verbatim.ent
-	sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@
-
-clean: clean/sources.list
-
-clean/sources.list:
-	rm -f sources.list
diff --git a/vendor/steamos/apt-vendor.ent b/vendor/steamos/apt-vendor.ent
index 69bb254ef..dc1b798e6 100644
--- a/vendor/steamos/apt-vendor.ent
+++ b/vendor/steamos/apt-vendor.ent
@@ -3,6 +3,6 @@
 <!ENTITY keyring-package "<package>valve-archive-keyring</package>">
 <!ENTITY keyring-filename "<filename>/usr/share/keyrings/valve-archive-keyring.gpg</filename>">
 <!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/valve-archive-removed-keys.gpg</filename>">
-<!ENTITY current-distro-codename "alchemist">
 <!ENTITY keyring-master-filename "">
 <!ENTITY keyring-uri "">
+<!ENTITY current-codename "alchemist">
diff --git a/vendor/steamos/makefile b/vendor/steamos/makefile
deleted file mode 100644
index 9ee0e65a2..000000000
--- a/vendor/steamos/makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- make -*-
-BASE=../..
-SUBDIR=vendor/steamos
-
-# Bring in the default rules
-include ../../buildlib/defaults.mak
-
-doc binary manpages: sources.list
-
-sources.list: sources.list.in ../../doc/apt-verbatim.ent
-	sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< | sed -e 's#&steamos-codename;#$(shell ../getinfo current-distro-codename)#g' > $@
-
-clean: clean/sources.list
-
-clean/sources.list:
-	rm -f sources.list
-
diff --git a/vendor/steamos/sources.list.in b/vendor/steamos/sources.list.in
index fed6c3818..69174d090 100644
--- a/vendor/steamos/sources.list.in
+++ b/vendor/steamos/sources.list.in
@@ -1,5 +1,5 @@
 # See sources.list(5) manpage for more information
 # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
 
-deb http://repo.steampowered.com/steamos &steamos-codename; main contrib non-free
-deb-src http://repo.steampowered.com/steamos &steamos-codename; main contrib non-free
+deb http://repo.steampowered.com/steamos &current-codename; main contrib non-free
+deb-src http://repo.steampowered.com/steamos &current-codename; main contrib non-free
diff --git a/vendor/tanglu/apt-vendor.ent b/vendor/tanglu/apt-vendor.ent
index 4b70a5f82..d2442209c 100644
--- a/vendor/tanglu/apt-vendor.ent
+++ b/vendor/tanglu/apt-vendor.ent
@@ -5,3 +5,4 @@
 <!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/tanglu-archive-removed-keys.gpg</filename>">
 <!ENTITY keyring-master-filename "">
 <!ENTITY keyring-uri "">
+<!ENTITY current-codename "bartholomea">
diff --git a/vendor/tanglu/makefile b/vendor/tanglu/makefile
deleted file mode 100644
index 9fe680bc6..000000000
--- a/vendor/tanglu/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- make -*-
-BASE=../..
-SUBDIR=vendor/tanglu
-
-# Bring in the default rules
-include ../../buildlib/defaults.mak
-
-doc binary manpages: sources.list
-
-sources.list: sources.list.in ../../doc/apt-verbatim.ent
-	sed -e 's#&tanglu-codename;#$(shell ../getinfo tanglu-codename)#g' $< > $@
-
-clean: clean/sources.list
-
-clean/sources.list:
-	rm -f sources.list
diff --git a/vendor/tanglu/sources.list.in b/vendor/tanglu/sources.list.in
index dfa219046..ce95e70c2 100644
--- a/vendor/tanglu/sources.list.in
+++ b/vendor/tanglu/sources.list.in
@@ -1,7 +1,7 @@
 # See sources.list(5) manpage for more information
 
-deb http://archive.tanglu.org/tanglu &tanglu-codename; main contrib non-free
-#deb-src http://archive.tanglu.org/tanglu &tanglu-codename; main contrib non-free
+deb http://archive.tanglu.org/tanglu &current-codename; main contrib non-free
+#deb-src http://archive.tanglu.org/tanglu &current-codename; main contrib non-free
 
-#deb http://archive.tanglu.org/tanglu &tanglu-codename;-updates main contrib non-free
-#deb-src http://archive.tanglu.org/tanglu &tanglu-codename;-updates main contrib non-free
+#deb http://archive.tanglu.org/tanglu &current-codename;-updates main contrib non-free
+#deb-src http://archive.tanglu.org/tanglu &current-codename;-updates main contrib non-free
diff --git a/vendor/ubuntu/apt.conf-01-vendor-ubuntu b/vendor/ubuntu/apt.conf-01-vendor-ubuntu
new file mode 100644
index 000000000..c4092ff44
--- /dev/null
+++ b/vendor/ubuntu/apt.conf-01-vendor-ubuntu
@@ -0,0 +1,6 @@
+// Server information for apt-changelog
+APT {
+  Changelogs {
+    Server "http://changelogs.ubuntu.com/changelogs";
+  };
+};
diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile
deleted file mode 100644
index afcaaf718..000000000
--- a/vendor/ubuntu/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- make -*-
-BASE=../..
-SUBDIR=vendor/ubuntu
-
-# Bring in the default rules
-include ../../buildlib/defaults.mak
-
-doc binary manpages: sources.list
-
-sources.list: sources.list.in ../../doc/apt-verbatim.ent
-	sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@
-
-clean: clean/sources.list
-
-clean/sources.list:
-	rm -f sources.list
diff --git a/vendor/vendor.makefile b/vendor/vendor.makefile
new file mode 100644
index 000000000..40b35ea3d
--- /dev/null
+++ b/vendor/vendor.makefile
@@ -0,0 +1,21 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=vendor/@@VENDOR@@
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+doc binary manpages: sources.list
+
+sources.list: sources.list.in ../../doc/apt-verbatim.ent
+	sed -e 's#&debian-stable-codename;#$(shell ../getinfo debian-stable-codename)#g' \
+		-e 's#&debian-oldstable-codename;#$(shell ../getinfo debian-oldstable-codename)#g' \
+		-e 's#&debian-testing-codename;#$(shell ../getinfo debian-testing-codename)#g' \
+		-e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' \
+		-e 's#&current-codename;#$(shell ../getinfo current-codename)#g' \
+		$< > $@
+
+clean: clean/sources.list
+
+clean/sources.list:
+	rm -f sources.list